shithub: libvpx

Info  •  Files  •  Log  •  Branches

normalize int64_t high value to INT64_MAX

Change-Id: I7e96d6199f882d35357f6a9a08c04ad0af5dc26e

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -1211,11 +1211,11 @@

   ENTROPY_CONTEXT l[16 * MAX_MB_PLANE], a[16 * MAX_MB_PLANE];

   PARTITION_CONTEXT sl[8], sa[8];

   int last_part_rate = INT_MAX;

-  int64_t last_part_dist = INT_MAX;

+  int64_t last_part_dist = INT64_MAX;

   int none_rate = INT_MAX;

-  int64_t none_dist = INT_MAX;

+  int64_t none_dist = INT64_MAX;

   int chosen_rate = INT_MAX;

-  int64_t chosen_dist = INT_MAX;

+  int64_t chosen_dist = INT64_MAX;

   BLOCK_SIZE sub_subsize = BLOCK_4X4;

   int splits_below = 0;

   BLOCK_SIZE bs_type = mi_8x8[0]->mbmi.sb_type;

@@ -1298,9 +1298,9 @@

         *get_sb_index(x, subsize) = 1;

         rd_pick_sb_modes(cpi, tile, mi_row + (ms >> 1), mi_col, &rt, &dt,

                          subsize, get_block_context(x, subsize), INT64_MAX);

-        if (rt == INT_MAX || dt == INT_MAX) {

+        if (rt == INT_MAX || dt == INT64_MAX) {

           last_part_rate = INT_MAX;

-          last_part_dist = INT_MAX;

+          last_part_dist = INT64_MAX;

           break;

         }

@@ -1322,9 +1322,9 @@

         *get_sb_index(x, subsize) = 1;

         rd_pick_sb_modes(cpi, tile, mi_row, mi_col + (ms >> 1), &rt, &dt,

                          subsize, get_block_context(x, subsize), INT64_MAX);

-        if (rt == INT_MAX || dt == INT_MAX) {

+        if (rt == INT_MAX || dt == INT64_MAX) {

           last_part_rate = INT_MAX;

-          last_part_dist = INT_MAX;

+          last_part_dist = INT64_MAX;

           break;

         }

         last_part_rate += rt;

@@ -1350,9 +1350,9 @@

         rd_use_partition(cpi, tile, mi_8x8 + jj * bss * mis + ii * bss, tp,

                          mi_row + y_idx, mi_col + x_idx, subsize, &rt, &dt,

                          i != 3);

-        if (rt == INT_MAX || dt == INT_MAX) {

+        if (rt == INT_MAX || dt == INT64_MAX) {

           last_part_rate = INT_MAX;

-          last_part_dist = INT_MAX;

+          last_part_dist = INT64_MAX;

           break;

         }

         last_part_rate += rt;

@@ -1401,9 +1401,9 @@

       restore_context(cpi, mi_row, mi_col, a, l, sa, sl, bsize);

-      if (rt == INT_MAX || dt == INT_MAX) {

+      if (rt == INT_MAX || dt == INT64_MAX) {

         chosen_rate = INT_MAX;

-        chosen_dist = INT_MAX;

+        chosen_dist = INT64_MAX;

         break;

       }

@@ -1450,7 +1450,7 @@

   // We must have chosen a partitioning and encoding or we'll fail later on.

   // No other opportunities for success.

   if ( bsize == BLOCK_64X64)

-    assert(chosen_rate < INT_MAX && chosen_dist < INT_MAX);

+    assert(chosen_rate < INT_MAX && chosen_dist < INT64_MAX);

   if (do_recon) {

     int output_enabled = (bsize == BLOCK_64X64);

@@ -1908,7 +1908,7 @@

   if (bsize == BLOCK_64X64) {

     assert(tp_orig < *tp);

     assert(best_rate < INT_MAX);

-    assert(best_dist < INT_MAX);

+    assert(best_dist < INT64_MAX);

   } else {

     assert(tp_orig == *tp);

   }

@@ -2259,7 +2259,7 @@

   MACROBLOCKD *const xd = &cpi->mb.e_mbd;

   int i, j;

   int chosen_rate = INT_MAX;

-  int64_t chosen_dist = INT_MAX;

+  int64_t chosen_dist = INT64_MAX;

   MB_PREDICTION_MODE mode = DC_PRED;

   int row8x8_remaining = MIN(MI_BLOCK_SIZE, tile->mi_row_end - mi_row);

   int col8x8_remaining = MIN(MI_BLOCK_SIZE, tile->mi_col_end - mi_col);

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -3223,7 +3223,7 @@

     int64_t tx_cache[TX_MODES];

     int i;

     int this_skip2 = 0;

-    int64_t total_sse = INT_MAX;

+    int64_t total_sse = INT64_MAX;

     int early_term = 0;

     for (i = 0; i < TX_MODES; ++i)

@@ -4387,7 +4387,7 @@

   if (best_rd == INT64_MAX && bsize < BLOCK_8X8) {

     *returnrate = INT_MAX;

-    *returndistortion = INT_MAX;

+    *returndistortion = INT64_MAX;

     return best_rd;

   }

-- 

⑨