commit 7fb3691fc880e9c6418c31ac29e4f65b6c572181
author Hui Su <huisu@google.com> Wed Jul 31 14:54:02 2019 -0700
committer Hui Su <huisu@google.com> Thu Aug 01 22:44:57 2019 +0000
tree d9a44f4ecf28b4454573c5265541474ee46bc65a
parent a40aee0bd61574d4e41d0d36e27b45752c8d50b0

Update symbol cost for the drl symbol

Small coding gain of about 0.02~0.03%.

STATS_CHANGED

Change-Id: I241337f5c65ad47fd9b552cb7c6aac47c0313228

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index ffd8c5c..5532ad8 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -1413,37 +1413,36 @@
         update_inter_mode_stats(fc, counts, mode, mode_ctx, allow_update_cdf);
       }
 
-      int mode_allowed = (mbmi->mode == NEWMV);
-      mode_allowed |= (mbmi->mode == NEW_NEWMV);
-      if (mode_allowed) {
-        uint8_t ref_frame_type = av1_ref_frame_type(mbmi->ref_frame);
-        int idx;
-
-        for (idx = 0; idx < 2; ++idx) {
+      const int new_mv = mbmi->mode == NEWMV || mbmi->mode == NEW_NEWMV;
+      if (new_mv) {
+        const uint8_t ref_frame_type = av1_ref_frame_type(mbmi->ref_frame);
+        for (int idx = 0; idx < 2; ++idx) {
           if (mbmi_ext->ref_mv_count[ref_frame_type] > idx + 1) {
-#if CONFIG_ENTROPY_STATS
-            uint8_t drl_ctx =
+            const uint8_t drl_ctx =
                 av1_drl_ctx(mbmi_ext->weight[ref_frame_type], idx);
+            if (allow_update_cdf) {
+              update_cdf(fc->drl_cdf[drl_ctx], mbmi->ref_mv_idx != idx, 2);
+            }
+#if CONFIG_ENTROPY_STATS
             ++counts->drl_mode[drl_ctx][mbmi->ref_mv_idx != idx];
 #endif
-
             if (mbmi->ref_mv_idx == idx) break;
           }
         }
       }
 
       if (have_nearmv_in_inter_mode(mbmi->mode)) {
-        uint8_t ref_frame_type = av1_ref_frame_type(mbmi->ref_frame);
-        int idx;
-
-        for (idx = 1; idx < 3; ++idx) {
+        const uint8_t ref_frame_type = av1_ref_frame_type(mbmi->ref_frame);
+        for (int idx = 1; idx < 3; ++idx) {
           if (mbmi_ext->ref_mv_count[ref_frame_type] > idx + 1) {
-#if CONFIG_ENTROPY_STATS
-            uint8_t drl_ctx =
+            const uint8_t drl_ctx =
                 av1_drl_ctx(mbmi_ext->weight[ref_frame_type], idx);
+            if (allow_update_cdf) {
+              update_cdf(fc->drl_cdf[drl_ctx], mbmi->ref_mv_idx != idx - 1, 2);
+            }
+#if CONFIG_ENTROPY_STATS
             ++counts->drl_mode[drl_ctx][mbmi->ref_mv_idx != idx - 1];
 #endif
-
             if (mbmi->ref_mv_idx == idx - 1) break;
           }
         }