Commit 3b22d1a8 authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review
Browse files

Merge "Make ref_mv_idx syntax context dependent on block distance only" into nextgenv2

parents 9c2d401c 8205b785
...@@ -431,24 +431,16 @@ static INLINE int16_t av1_mode_context_analyzer( ...@@ -431,24 +431,16 @@ static INLINE int16_t av1_mode_context_analyzer(
static INLINE uint8_t av1_drl_ctx(const CANDIDATE_MV *ref_mv_stack, static INLINE uint8_t av1_drl_ctx(const CANDIDATE_MV *ref_mv_stack,
int ref_idx) { int ref_idx) {
if (ref_mv_stack[ref_idx].weight >= REF_CAT_LEVEL && if (ref_mv_stack[ref_idx].weight >= REF_CAT_LEVEL &&
ref_mv_stack[ref_idx + 1].weight >= REF_CAT_LEVEL) { ref_mv_stack[ref_idx + 1].weight >= REF_CAT_LEVEL)
if (ref_mv_stack[ref_idx].weight == ref_mv_stack[ref_idx + 1].weight) return 0;
return 0;
else
return 1;
}
if (ref_mv_stack[ref_idx].weight >= REF_CAT_LEVEL && if (ref_mv_stack[ref_idx].weight >= REF_CAT_LEVEL &&
ref_mv_stack[ref_idx + 1].weight < REF_CAT_LEVEL) ref_mv_stack[ref_idx + 1].weight < REF_CAT_LEVEL)
return 2; return 2;
if (ref_mv_stack[ref_idx].weight < REF_CAT_LEVEL && if (ref_mv_stack[ref_idx].weight < REF_CAT_LEVEL &&
ref_mv_stack[ref_idx + 1].weight < REF_CAT_LEVEL) { ref_mv_stack[ref_idx + 1].weight < REF_CAT_LEVEL)
if (ref_mv_stack[ref_idx].weight == ref_mv_stack[ref_idx + 1].weight) return 3;
return 3;
else
return 4;
}
return 0; return 0;
} }
......
Supports Markdown
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