shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Disable adaptive pred filter for non-split mode"

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

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

@@ -1931,14 +1931,17 @@

     BLOCK_SIZE i;

     MACROBLOCK *x = &cpi->mb;

-    for (i = BLOCK_4X4; i < BLOCK_8X8; ++i) {

-      const int num_4x4_w = num_4x4_blocks_wide_lookup[i];

-      const int num_4x4_h = num_4x4_blocks_high_lookup[i];

-      const int num_4x4_blk = MAX(4, num_4x4_w * num_4x4_h);

-      for (x->sb_index = 0; x->sb_index < 4; ++x->sb_index)

-        for (x->mb_index = 0; x->mb_index < 4; ++x->mb_index)

-          for (x->b_index = 0; x->b_index < 16 / num_4x4_blk; ++x->b_index)

-            get_block_context(x, i)->pred_interp_filter = SWITCHABLE;

+

+    if (cpi->sf.adaptive_pred_interp_filter) {

+      for (i = BLOCK_4X4; i < BLOCK_8X8; ++i) {

+        const int num_4x4_w = num_4x4_blocks_wide_lookup[i];

+        const int num_4x4_h = num_4x4_blocks_high_lookup[i];

+        const int num_4x4_blk = MAX(4, num_4x4_w * num_4x4_h);

+        for (x->sb_index = 0; x->sb_index < 4; ++x->sb_index)

+          for (x->mb_index = 0; x->mb_index < 4; ++x->mb_index)

+            for (x->b_index = 0; x->b_index < 16 / num_4x4_blk; ++x->b_index)

+              get_block_context(x, i)->pred_interp_filter = SWITCHABLE;

+      }

     }

     vp9_zero(cpi->mb.pred_mv);

--- a/vp9/encoder/vp9_onyx_if.c

+++ b/vp9/encoder/vp9_onyx_if.c

@@ -977,6 +977,9 @@

   if (cpi->encode_breakout && cpi->oxcf.mode == MODE_REALTIME &&

       sf->encode_breakout_thresh > cpi->encode_breakout)

     cpi->encode_breakout = sf->encode_breakout_thresh;

+

+  if (sf->disable_split_mask == DISABLE_ALL_SPLIT)

+    sf->adaptive_pred_interp_filter = 0;

 }

 static void alloc_raw_frame_buffers(VP9_COMP *cpi) {

-- 

⑨