commit 41debdc7a9683032a6116d6cda4c094da8babb6d
author Ravi Chaudhary <ravi.chaudhary@ittiam.com> Fri Feb 08 17:21:52 2019 +0530
committer Yunqing Wang <yunqingwang@google.com> Mon Feb 11 17:54:33 2019 +0000
tree 30b03f0616c24a542002dc449d4233b022c70be0
parent 3a9e4672be019bcd2478863f8218f560e06bed27

Fix compiler warning in ethread.c

Compiler warning has been fixed.

BUG=aomedia:2317

Change-Id: I4b6df84d1c720fe6db5d98037f281f264bb99b56

av1/encoder/ethread.c

diff --git a/av1/encoder/ethread.c b/av1/encoder/ethread.c
index 5374053..c8c2107 100644
--- a/av1/encoder/ethread.c
+++ b/av1/encoder/ethread.c
@@ -236,8 +236,12 @@
       int tile_index = tile_row * tile_cols + tile_col;
       TileDataEnc *this_tile = &cpi->tile_data[tile_index];
       AV1RowMTInfo *row_mt_info = &this_tile->row_mt_info;
-      int theoretical_limit_on_threads = (int)(round(AOMMAX(
-          (double)(av1_get_sb_cols_in_tile(cm, this_tile->tile_info)) / 2, 1)));
+      int num_sb_rows_in_tile =
+          av1_get_sb_rows_in_tile(cm, this_tile->tile_info);
+      int num_sb_cols_in_tile =
+          av1_get_sb_cols_in_tile(cm, this_tile->tile_info);
+      int theoretical_limit_on_threads =
+          AOMMIN((num_sb_cols_in_tile + 1) >> 1, num_sb_rows_in_tile);
       int num_threads_working = row_mt_info->num_threads_working;
       if (num_threads_working < theoretical_limit_on_threads) {
         int num_mis_to_encode =
@@ -637,8 +641,8 @@
           av1_get_sb_rows_in_tile(cm, tile_data->tile_info);
       int num_sb_cols_in_tile =
           av1_get_sb_cols_in_tile(cm, tile_data->tile_info);
-      total_num_threads_row_mt += (int)round(AOMMIN(
-          AOMMAX((double)(num_sb_cols_in_tile) / 2, 1), num_sb_rows_in_tile));
+      total_num_threads_row_mt +=
+          AOMMIN((num_sb_cols_in_tile + 1) >> 1, num_sb_rows_in_tile);
       max_sb_rows = AOMMAX(max_sb_rows, num_sb_rows_in_tile);
     }
   }