commit 4a97d6ac5b5f5b618b728fc4cf356ea855731c9f
author Jingning Han <jingning@google.com> Sun Nov 20 17:07:57 2016 -0800
committer Jingning Han <jingning@google.com> Mon Nov 21 06:05:05 2016 +0000
tree 00ceccf4da68d424c8cd6cf11c83181be1ab23a4
parent 3f338830cd0d07ed6e61a497c8e7ed15211258b7

Remove special handle for rectangular block size in DRL system

This removes the dependency of context decoding from the candidate
list ranking in hardware implementation.

Change-Id: Iff34e7e6e78c9b32f435ded30629e43e73ac2f13

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index 9b8787d..2f49a75 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -299,31 +299,6 @@
   return has_tr;
 }
 
-static void handle_sec_rect_block(const MB_MODE_INFO *const candidate,
-                                  uint8_t refmv_count,
-                                  CANDIDATE_MV *ref_mv_stack,
-                                  MV_REFERENCE_FRAME ref_frame,
-                                  int16_t *mode_context) {
-  int rf, idx;
-
-  for (rf = 0; rf < 2; ++rf) {
-    if (candidate->ref_frame[rf] == ref_frame) {
-      const int list_range = AOMMIN(refmv_count, MAX_MV_REF_CANDIDATES);
-
-      const int_mv pred_mv = candidate->mv[rf];
-      for (idx = 0; idx < list_range; ++idx)
-        if (pred_mv.as_int == ref_mv_stack[idx].this_mv.as_int) break;
-
-      if (idx < list_range) {
-        if (idx == 0)
-          mode_context[ref_frame] |= (1 << SKIP_NEARESTMV_OFFSET);
-        else if (idx == 1)
-          mode_context[ref_frame] |= (1 << SKIP_NEARMV_OFFSET);
-      }
-    }
-  }
-}
-
 static int add_col_ref_mv(const AV1_COMMON *cm,
                           const MV_REF *prev_frame_mvs_base,
                           const MACROBLOCKD *xd, int mi_row, int mi_col,
@@ -512,23 +487,6 @@
     len = nr_len;
   }
 
-  // TODO(jingning): Clean-up needed.
-  if (xd->is_sec_rect) {
-    if (xd->n8_w < xd->n8_h) {
-      const MODE_INFO *const candidate_mi = xd->mi[-1];
-      const MB_MODE_INFO *const candidate = &candidate_mi->mbmi;
-      handle_sec_rect_block(candidate, nearest_refmv_count, ref_mv_stack,
-                            ref_frame, mode_context);
-    }
-
-    if (xd->n8_w > xd->n8_h) {
-      const MODE_INFO *const candidate_mi = xd->mi[-xd->mi_stride];
-      const MB_MODE_INFO *const candidate = &candidate_mi->mbmi;
-      handle_sec_rect_block(candidate, nearest_refmv_count, ref_mv_stack,
-                            ref_frame, mode_context);
-    }
-  }
-
   if (rf[1] > NONE) {
     for (idx = 0; idx < *refmv_count; ++idx) {
       clamp_mv_ref(&ref_mv_stack[idx].this_mv.as_mv, xd->n8_w << 3,