shithub: libvpx

Info  •  Files  •  Log  •  Branches

Remove mode_skip_start and mask code for sub 8x8

This code serves no purpose in the re-factored sub 8x8 code.

Change-Id: I5364986224d1a28b71bcb046ec8557a3d14aaa47

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

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

@@ -3910,33 +3910,6 @@

     ref_frame = vp9_ref_order[mode_index].ref_frame;

     second_ref_frame = vp9_ref_order[mode_index].second_ref_frame;

-    // FIXME(jingning): this was temporarily disabled for sub8x8 blocks.

-    // Look at the reference frame of the best mode so far and set the

-    // skip mask to look at a subset of the remaining modes.

-    if (0 && mode_index > cpi->sf.mode_skip_start) {

-      if (mode_index == (cpi->sf.mode_skip_start + 1)) {

-        switch (vp9_ref_order[best_mode_index].ref_frame) {

-          case INTRA_FRAME:

-            cpi->mode_skip_mask = 0;

-            break;

-          case LAST_FRAME:

-            cpi->mode_skip_mask = LAST_FRAME_MODE_MASK;

-            break;

-          case GOLDEN_FRAME:

-            cpi->mode_skip_mask = GOLDEN_FRAME_MODE_MASK;

-            break;

-          case ALTREF_FRAME:

-            cpi->mode_skip_mask = ALT_REF_MODE_MASK;

-            break;

-          case NONE:

-          case MAX_REF_FRAMES:

-            assert(!"Invalid Reference frame");

-        }

-      }

-      if (cpi->mode_skip_mask & ((int64_t)1 << mode_index))

-        continue;

-    }

-

     // Skip if the current reference frame has been masked off

     if (cpi->sf.reference_masking && !cpi->set_ref_frame_mask &&

         (cpi->ref_frame_mask & (1 << ref_frame)))

-- 

⑨