Commit abf6f284 authored by Jingning Han's avatar Jingning Han
Browse files

Make inter mode context depend on nearest neighbor

Reduce the inter mode context model dependency to be within the
nearest neighbor search.

Change-Id: I0b9e7d360919a809b5400f233040bb474ab56768
parent 426caba9
......@@ -920,19 +920,21 @@ static void setup_ref_mv_list(const AV1_COMMON *cm, const MACROBLOCKD *xd,
case 0: mode_context[ref_frame] |= 0;
#if !CONFIG_OPT_REF_MV
if (*refmv_count >= 1) mode_context[ref_frame] |= 1;
#endif
if (*refmv_count == 1)
mode_context[ref_frame] |= (1 << REFMV_OFFSET);
else if (*refmv_count >= 2)
mode_context[ref_frame] |= (2 << REFMV_OFFSET);
#endif
break;
case 1:
mode_context[ref_frame] |= (newmv_count > 0) ? 2 : 3;
case 1: mode_context[ref_frame] |= (newmv_count > 0) ? 2 : 3;
#if CONFIG_OPT_REF_MV
mode_context[ref_frame] |= (3 << REFMV_OFFSET);
#else
if (*refmv_count == 1)
mode_context[ref_frame] |= (3 << REFMV_OFFSET);
else if (*refmv_count >= 2)
mode_context[ref_frame] |= (4 << REFMV_OFFSET);
#endif
break;
case 2:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment