commit a39e83d74333eebaceaa05eb04df33519d8083e1
author Jingning Han <jingning@google.com> Thu Feb 11 16:38:13 2016 -0800
committer Jingning Han <jingning@google.com> Thu Feb 11 16:38:13 2016 -0800
tree d35ba39518ca01e0e70f5e300c897d11fa15ef83
parent 57c83b330ea61dc954a5963a845c5e86b27b086d

Refactor vp10_drl_idx concept

Remove the implicit assumption on offsetting the index by 1.

Change-Id: I6f1d391e067d57b7e45b9287e866014dbc16da71

vp10/encoder/rdopt.c

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 9287bdb..5a59e2d 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -6435,7 +6435,7 @@
         int ref_set = VPXMIN(2, mbmi_ext->ref_mv_count[ref_frame_type] - 2);
 
         uint8_t drl0_ctx =
-            vp10_drl_ctx(mbmi_ext->ref_mv_stack[ref_frame_type], 0);
+            vp10_drl_ctx(mbmi_ext->ref_mv_stack[ref_frame_type], 1);
         rate2 += cpi->drl_mode_cost0[drl0_ctx][0];
 
         if (this_rd < INT64_MAX) {
@@ -6500,7 +6500,7 @@
 
           if (mbmi_ext->ref_mv_count[ref_frame_type] > 3) {
             uint8_t drl1_ctx =
-                vp10_drl_ctx(mbmi_ext->ref_mv_stack[ref_frame_type], 1);
+                vp10_drl_ctx(mbmi_ext->ref_mv_stack[ref_frame_type], 2);
             tmp_rate += cpi->drl_mode_cost1[drl1_ctx][ref_idx];
           }