shithub: libvpx

Download patch

ref: 54e702b5d77a3fda1d74f727909962fd6924a4e7
parent: b30445edd672bf9cacc5e28b6cf1db24b6d378ea
parent: c8f481fa3d1cac58acdef586e6b3983a1998e97c
author: Jingning Han <jingning@google.com>
date: Fri Oct 11 05:21:06 EDT 2013 

Merge "Restore mode skip feature in sub8x8 rd loop"


--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -3903,6 +3903,32 @@
     ref_frame = vp9_ref_order[mode_index].ref_frame;
     second_ref_frame = vp9_ref_order[mode_index].second_ref_frame;
 
+    // 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 (mode_index > 2 && cpi->sf.mode_skip_start < MAX_MODES) {
+      if (mode_index == 3) {
+        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 = 0x0010;
+            break;
+          case GOLDEN_FRAME:
+            cpi->mode_skip_mask = 0x0008;
+            break;
+          case ALTREF_FRAME:
+            cpi->mode_skip_mask = 0x0000;
+            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)))