commit 060f7f2ce6a9dc50144fb3a762ca7a4c274f2935
author Wei-Ting Lin <weitinglin@google.com> Tue Aug 01 10:26:24 2017 -0700
committer Wei-ting Lin <weitinglin@google.com> Wed Aug 02 01:02:46 2017 +0000
tree 051a73bcd4b4bfe00a6743a93f2d3cac6b1ce43e
parent a506eb6145042915e1876e00346230d62c2f1fe8

Fill ncobmc mode and motion mode costs using cdf

Also remove cost update in encodeframe.c as the cost
is now updated through the function av1_fill_mode_rates
in rd.c

Change-Id: Ib670fd078320c706747429bb86e0265bc08356fd

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index fc46f56..8e8cb3c 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -1794,8 +1794,12 @@
           ADAPT_OVERLAP_BLOCK ao_block =
               adapt_overlap_block_lookup[mbmi->sb_type];
           ++counts->ncobmc_mode[ao_block][mbmi->ncobmc_mode[0]];
+          update_cdf(xd->tile_ctx->ncobmc_mode_cdf[ao_block],
+                     mbmi->ncobmc_mode[0], MAX_NCOBMC_MODES);
           if (mi_size_wide[mbmi->sb_type] != mi_size_high[mbmi->sb_type]) {
             ++counts->ncobmc_mode[ao_block][mbmi->ncobmc_mode[1]];
+            update_cdf(xd->tile_ctx->ncobmc_mode_cdf[ao_block],
+                       mbmi->ncobmc_mode[1], MAX_NCOBMC_MODES);
           }
         }
 #endif
@@ -4654,13 +4658,6 @@
 #endif  // CONFIG_SPEED_REFS
     }
   }
-#if CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
-  // TODO(yuec) Suboptimal fix. Need to implement per-block update
-  for (int i = BLOCK_8X8; i < BLOCK_SIZES_ALL; i++) {
-    av1_cost_tokens_from_cdf(x->motion_mode_cost[i],
-                             xd->tile_ctx->motion_mode_cdf[i], NULL);
-  }
-#endif
 }
 
 static void init_encode_frame_mb_context(AV1_COMP *cpi) {
@@ -4909,12 +4906,6 @@
 
   av1_setup_across_tile_boundary_info(cm, tile_info);
 
-#if CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
-  for (int i = BLOCK_8X8; i < BLOCK_SIZES_ALL; i++) {
-    av1_cost_tokens_from_cdf(td->mb.motion_mode_cost[i],
-                             cm->fc->motion_mode_cdf[i], NULL);
-  }
-#endif
   for (mi_row = tile_info->mi_row_start; mi_row < tile_info->mi_row_end;
        mi_row += cm->mib_size) {
     encode_rd_sb_row(cpi, td, this_tile, mi_row, &tok);

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 2c91a35..25afc21 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -228,8 +228,8 @@
 #endif  // CONFIG_EXT_INTER
 #if CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
     for (i = BLOCK_8X8; i < BLOCK_SIZES_ALL; i++) {
-      av1_cost_tokens(x->motion_mode_cost[i], fc->motion_mode_prob[i],
-                      av1_motion_mode_tree);
+      av1_cost_tokens_from_cdf(x->motion_mode_cost[i], fc->motion_mode_cdf[i],
+                               NULL);
     }
 #if CONFIG_MOTION_VAR && CONFIG_WARPED_MOTION
     for (i = BLOCK_8X8; i < BLOCK_SIZES_ALL; i++) {
@@ -239,8 +239,8 @@
 #endif  // CONFIG_MOTION_VAR && CONFIG_WARPED_MOTION
 #if CONFIG_MOTION_VAR && CONFIG_NCOBMC_ADAPT_WEIGHT
     for (i = ADAPT_OVERLAP_BLOCK_8X8; i < ADAPT_OVERLAP_BLOCKS; ++i) {
-      av1_cost_tokens(x->ncobmc_mode_cost[i], fc->ncobmc_mode_prob[i],
-                      av1_ncobmc_mode_tree);
+      av1_cost_tokens_from_cdf(x->ncobmc_mode_cost[i], fc->ncobmc_mode_cdf[i],
+                               NULL);
     }
 #endif  // CONFIG_MOTION_VAR && CONFIG_NCOBMC_ADAPT_WEIGHT
 #endif  // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION