Commit 83ecafbd authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review

Merge "Enable context based motion vector entropy coding" into nextgenv2

parents a570cefc 47bc2a57
......@@ -227,7 +227,7 @@ typedef enum {
#define SKIP_CONTEXTS 3
#if CONFIG_REF_MV
#define NMV_CONTEXTS 2
#define NMV_CONTEXTS 3
#define NEWMV_MODE_CONTEXTS 7
#define ZEROMV_MODE_CONTEXTS 2
......
......@@ -236,9 +236,11 @@ static INLINE int vp10_nmv_ctx(const uint8_t ref_mv_count,
if (ref_mv_stack[0].weight > REF_CAT_LEVEL &&
ref_mv_count > 0) {
if (abs(ref_mv_stack[0].this_mv.as_mv.row -
ref_mv_stack[0].pred_mv.as_mv.row) < 8 &&
abs(ref_mv_stack[0].this_mv.as_mv.col -
ref_mv_stack[0].pred_mv.as_mv.col) < 8)
ref_mv_stack[0].pred_mv.as_mv.row) <= 4 &&
abs(ref_mv_stack[0].this_mv.as_mv.col -
ref_mv_stack[0].pred_mv.as_mv.col) <= 4)
return 2;
else
return 1;
}
return 0;
......
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