shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Correct the mode decisions in special cases"

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

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

@@ -2850,6 +2850,8 @@

     // them for this frame.

     mbmi->interp_filter = cm->interp_filter == SWITCHABLE ? EIGHTTAP

                                                           : cm->interp_filter;

+    mbmi->mv[0].as_int = mbmi->mv[1].as_int = 0;

+

     x->skip = 0;

     set_ref_ptrs(cm, xd, ref_frame, second_ref_frame);

@@ -3093,6 +3095,28 @@

     if (x->skip && !comp_pred)

       break;

+  }

+

+  // The inter modes' rate costs are not calculated precisely in some cases.

+  // Therefore, sometimes, NEWMV is chosen instead of NEARESTMV, NEARMV, and

+  // ZEROMV. Here, checks are added for those cases, and the mode decisions

+  // are corrected.

+  if (best_mbmode.mode == NEWMV) {

+    const MV_REFERENCE_FRAME refs[2] = {best_mbmode.ref_frame[0],

+        best_mbmode.ref_frame[1]};

+    int comp_pred_mode = refs[1] > INTRA_FRAME;

+

+    if (frame_mv[NEARESTMV][refs[0]].as_int == best_mbmode.mv[0].as_int &&

+        ((comp_pred_mode && frame_mv[NEARESTMV][refs[1]].as_int ==

+            best_mbmode.mv[1].as_int) || !comp_pred_mode))

+      best_mbmode.mode = NEARESTMV;

+    else if (frame_mv[NEARMV][refs[0]].as_int == best_mbmode.mv[0].as_int &&

+        ((comp_pred_mode && frame_mv[NEARMV][refs[1]].as_int ==

+            best_mbmode.mv[1].as_int) || !comp_pred_mode))

+      best_mbmode.mode = NEARMV;

+    else if (best_mbmode.mv[0].as_int == 0 &&

+        ((comp_pred_mode && best_mbmode.mv[1].as_int == 0) || !comp_pred_mode))

+      best_mbmode.mode = ZEROMV;

   }

   if (best_mode_index < 0 || best_rd >= best_rd_so_far)

-- 

⑨