commit 0009e61185a61e4405946ca09d61742ac4c92667
author Yue Chen <yuec@google.com> Tue Mar 27 11:03:16 2018 -0700
committer Yue Chen <yuec@google.com> Tue Mar 27 20:36:25 2018 +0000
tree e25f1e6881539ffc2aee92b31a2eab00fb443c9b
parent e647a10b694c489e0a15bc47ff313e509b739fd7

[STATS_CHANGED] Correct intra tx size cdf update and counting

It was in the wrong place, therefore the cdf is not updated properly
and the stats collected were all zero.

STATS_CHANGED

Change-Id: I0ad5757b3b3763e8c02e5cce6fb9342f5090dd86

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 5ebeb05..fca12cf 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4769,6 +4769,17 @@
                                   tile_data->allow_update_cdf);
       } else {
         if (mbmi->tx_size != get_max_rect_tx_size(bsize)) ++x->txb_split_count;
+        if (block_signals_txsize(bsize)) {
+          const int tx_size_ctx = get_tx_size_context(xd);
+          const int32_t tx_size_cat = bsize_to_tx_size_cat(bsize, 0);
+          const int depth = tx_size_to_depth(mbmi->tx_size, bsize, 0);
+          const int max_depths = bsize_to_max_depth(bsize, 0);
+
+          if (tile_data->allow_update_cdf)
+            update_cdf(xd->tile_ctx->tx_size_cdf[tx_size_cat][tx_size_ctx],
+                       depth, max_depths + 1);
+          ++td->counts->intra_tx_size[tx_size_cat][tx_size_ctx][depth];
+        }
       }
       assert(IMPLIES(is_rect_tx(mbmi->tx_size), is_rect_tx_allowed(xd, mbmi)));
     } else {
@@ -4783,17 +4794,6 @@
         }
       } else {
         intra_tx_size = mbmi->tx_size;
-        if (block_signals_txsize(bsize) && !xd->lossless[mbmi->segment_id]) {
-          const int tx_size_ctx = get_tx_size_context(xd);
-          const int32_t tx_size_cat = bsize_to_tx_size_cat(bsize, 0);
-          const int depth = tx_size_to_depth(intra_tx_size, bsize, 0);
-          const int max_depths = bsize_to_max_depth(bsize, 0);
-
-          if (tile_data->allow_update_cdf)
-            update_cdf(xd->tile_ctx->tx_size_cdf[tx_size_cat][tx_size_ctx],
-                       depth, max_depths + 1);
-          ++td->counts->intra_tx_size[tx_size_cat][tx_size_ctx][depth];
-        }
       }
 
       for (j = 0; j < mi_height; j++)