Bugfix in forward update with modeling on.

Fixes an issue with reducing branch cts in the encoder causing
a drop in performance. The bug was introduced in a previous
clean up patch.

Test: Went back to the offending patch, applied this same fix
to it, and checked that results are identical to the parent
of that patch.

Change-Id: I0bad8e2d930235d0284300fcebf836ceb56f2498

diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c
index e4db5c1dc4dc5622c3958e444ab7e25f4a3a4baa..f1bd14d22b0463b66ba8451e2f51a355762b254d 100644 (file)
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -1056,13 +1056,13 @@ static void build_tree_distribution(vp9_coeff_probs_model *coef_probs,
                                     VP9_COMP *cpi,
                                     vp9_coeff_accum *context_counters,
 #endif
-                                    vp9_coeff_stats_model *coef_branch_ct,
+                                    vp9_coeff_stats *coef_branch_ct,
                                     int block_types) {
   int i, j, k, l;
 #ifdef ENTROPY_STATS
   int t = 0;
 #endif
-  unsigned int model_counts[UNCONSTRAINED_NODES + 1];
+  vp9_prob full_probs[ENTROPY_NODES];
 
   for (i = 0; i < block_types; ++i) {
     for (j = 0; j < REF_TYPES; ++j) {
@@ -1070,11 +1070,12 @@ static void build_tree_distribution(vp9_coeff_probs_model *coef_probs,
         for (l = 0; l < PREV_COEF_CONTEXTS; ++l) {
           if (l >= 3 && k == 0)
             continue;
-          vp9_full_to_model_count(model_counts, coef_counts[i][j][k][l]);
-          vp9_tree_probs_from_distribution(vp9_coefmodel_tree,
-                                           coef_probs[i][j][k][l],
+          vp9_tree_probs_from_distribution(vp9_coef_tree,
+                                           full_probs,
                                            coef_branch_ct[i][j][k][l],
-                                           model_counts, 0);
+                                           coef_counts[i][j][k][l], 0);
+          vpx_memcpy(coef_probs[i][j][k][l], full_probs,
+                     sizeof(vp9_prob) * UNCONSTRAINED_NODES);
 #if CONFIG_BALANCED_COEFTREE
           coef_branch_ct[i][j][k][l][1][1] = eob_branch_ct[i][j][k][l] -
                                              coef_branch_ct[i][j][k][l][1][0];
@@ -1141,14 +1142,13 @@ static void update_coef_probs_common(
 #endif
     vp9_coeff_probs_model *new_frame_coef_probs,
     vp9_coeff_probs_model *old_frame_coef_probs,
-    vp9_coeff_stats_model *frame_branch_ct,
+    vp9_coeff_stats *frame_branch_ct,
     TX_SIZE tx_size) {
   int i, j, k, l, t;
   int update[2] = {0, 0};
   int savings;
 
   const int entropy_nodes_update = UNCONSTRAINED_NODES;
-  // vp9_prob bestupd = find_coef_update_prob(cpi);
 
   const int tstart = 0;
   /* dry run to see if there is any udpate at all needed */
@@ -1162,7 +1162,7 @@ static void update_coef_probs_common(
             vp9_prob newp = new_frame_coef_probs[i][j][k][l][t];
             const vp9_prob oldp = old_frame_coef_probs[i][j][k][l][t];
             const vp9_prob upd = vp9_coef_update_prob[t];
-            int s;  // = prev_coef_savings[t];
+            int s;
             int u = 0;
 
             if (l >= 3 && k == 0)
@@ -1204,11 +1204,10 @@ static void update_coef_probs_common(
             vp9_prob newp = new_frame_coef_probs[i][j][k][l][t];
             vp9_prob *oldp = old_frame_coef_probs[i][j][k][l] + t;
             const vp9_prob upd = vp9_coef_update_prob[t];
-            int s;  // = prev_coef_savings[t];
+            int s;
             int u = 0;
             if (l >= 3 && k == 0)
               continue;
-
             if (t == PIVOT_NODE)
               s = prob_diff_update_savings_search_model(
                   frame_branch_ct[i][j][k][l][0],

diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h
index 24a2acbd503c09c0296d9e41ecc141136703d15b..98ff09de04b767b3d2bab2635914ea3812ea0a91 100644 (file)
--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -423,19 +423,19 @@ typedef struct VP9_COMP {
 
   vp9_coeff_count coef_counts_4x4[BLOCK_TYPES];
   vp9_coeff_probs_model frame_coef_probs_4x4[BLOCK_TYPES];
-  vp9_coeff_stats_model frame_branch_ct_4x4[BLOCK_TYPES];
+  vp9_coeff_stats frame_branch_ct_4x4[BLOCK_TYPES];
 
   vp9_coeff_count coef_counts_8x8[BLOCK_TYPES];
   vp9_coeff_probs_model frame_coef_probs_8x8[BLOCK_TYPES];
-  vp9_coeff_stats_model frame_branch_ct_8x8[BLOCK_TYPES];
+  vp9_coeff_stats frame_branch_ct_8x8[BLOCK_TYPES];
 
   vp9_coeff_count coef_counts_16x16[BLOCK_TYPES];
   vp9_coeff_probs_model frame_coef_probs_16x16[BLOCK_TYPES];
-  vp9_coeff_stats_model frame_branch_ct_16x16[BLOCK_TYPES];
+  vp9_coeff_stats frame_branch_ct_16x16[BLOCK_TYPES];
 
   vp9_coeff_count coef_counts_32x32[BLOCK_TYPES];
   vp9_coeff_probs_model frame_coef_probs_32x32[BLOCK_TYPES];
-  vp9_coeff_stats_model frame_branch_ct_32x32[BLOCK_TYPES];
+  vp9_coeff_stats frame_branch_ct_32x32[BLOCK_TYPES];
 
   int gfu_boost;
   int last_boost;