commit 90ed98f98ac46339ec34c0e6f5db2a4ee97482e4
author Timothy B. Terriberry <tterriberry@mozilla.com> Wed May 10 18:46:52 2017 -0700
committer Tim Terriberry <tterriberry@mozilla.com> Sat May 20 02:26:30 2017 +0000
tree 39055cf768a2e5f80102fa352720887ea0805b7c
parent cd5395184ef75ccffc767614fedc0229f3457672

new_tokenset: Add missing blockzero_probs for cb4x4.

cb4x4 adds a new TX_2X2 to the TX_SIZES enum, which offsets the
indexing of blockzero_probs. Add a set of default probabilities for
this case (simply copied from the TX_4X4 probabilities).

These will only be used if chroma_2x2 is enabled (though moving the
other probabilities back to their correct offset will affect all
other sizes).

This is an encoder-only change.

AWCY results on objective-1-fast:

cb4x4-fix-reset_skip@2017-05-11T06:28:45.482Z -> cb4x4-fix-blockzero_probs@2017-05-11T06:29:26.242Z
   PSNR | PSNR Cb | PSNR Cr | PSNR HVS |    SSIM | MS SSIM | CIEDE 2000
-0.1520 | -0.2682 | -0.0972 |  -0.2342 | -0.1638 | -0.1701 |    -0.3278

Change-Id: I5594f19af2935c8a8d43105a27ad33f6222ed7f2

av1/common/entropy.c

diff --git a/av1/common/entropy.c b/av1/common/entropy.c
index 44ca5e5..0f2c396 100644
--- a/av1/common/entropy.c
+++ b/av1/common/entropy.c
@@ -4416,6 +4416,18 @@
 #if CONFIG_DAALA_EC || CONFIG_ANS
 static const aom_prob av1_default_blockzero_probs[TX_SIZES][PLANE_TYPES]
                                            [REF_TYPES][BLOCKZ_CONTEXTS] = {
+#if CONFIG_CB4X4
+  { // TX_2x2
+    { // Y plane
+      { 195, 84, 8, },  // Intra
+      { 191, 124, 25, },  // Inter
+    },
+    { // UV plane
+      { 214, 132, 42, },  // Intra
+      { 229, 143, 46, },  // Inter
+    },
+  },
+#endif
   { // TX_4x4
     { // Y plane
       { 195, 84, 8, },  // Intra