shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Use frame index directly in get_chessboard_index"

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

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

@@ -1836,7 +1836,7 @@

   BLOCK_SIZE max_size = BLOCK_8X8;

   int bsl = mi_width_log2(BLOCK_64X64);

   const int search_range_ctrl = (((mi_row + mi_col) >> bsl) +

-                                     get_chessboard_index(cm)) % 2;

+                       get_chessboard_index(cm->current_video_frame)) & 0x1;

   // Trap case where we do not have a prediction.

   if (search_range_ctrl &&

       (left_in_image || above_in_image || cm->frame_type != KEY_FRAME)) {

--- a/vp9/encoder/vp9_encoder.h

+++ b/vp9/encoder/vp9_encoder.h

@@ -551,8 +551,8 @@

                                                          : 0];

 }

-static INLINE int get_chessboard_index(const VP9_COMMON *cm) {

-  return cm->current_video_frame % 2;

+static INLINE int get_chessboard_index(const int frame_index) {

+  return frame_index & 0x1;

 }

 #ifdef __cplusplus

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -394,7 +394,8 @@

   INTERP_FILTER filter_ref = cm->interp_filter;

   int bsl = mi_width_log2(bsize);

   const int pred_filter_search = cm->interp_filter == SWITCHABLE ?

-      (((mi_row + mi_col) >> bsl) + get_chessboard_index(cm)) % 2 : 0;

+      (((mi_row + mi_col) >> bsl) +

+       get_chessboard_index(cm->current_video_frame)) & 0x1 : 0;

   int const_motion[MAX_REF_FRAMES] = { 0 };

   int bh = num_4x4_blocks_high_lookup[bsize] << 2;

   int bw = num_4x4_blocks_wide_lookup[bsize] << 2;

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

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

@@ -2025,7 +2025,8 @@

   int bsl = mi_width_log2_lookup[bsize];

   int pred_filter_search = cpi->sf.cb_pred_filter_search ?

-      (((mi_row + mi_col) >> bsl)) & 0x01 : 0;

+      (((mi_row + mi_col) >> bsl) +

+       get_chessboard_index(cm->current_video_frame)) & 0x1 : 0;

   if (pred_filter_search) {

     INTERP_FILTER af = SWITCHABLE, lf = SWITCHABLE;

-- 

⑨