commit a6b0c4c9cdff07ace2b9ca9e7c76ecd6a2789748
author Jingning Han <jingning@google.com> Wed Jan 18 15:28:29 2017 -0800
committer Jingning Han <jingning@google.com> Thu Jan 19 01:18:32 2017 +0000
tree e444c56c563fd4e1c0ea1cd19f194605cde36038
parent 25f2f7d95faf03269064219d707be5791fca6096

Support adaptive scan order in cb4x4 mode

This commit adds 2x2 transform block scan order to make the
adaptive scan order support cb4x4 mode.

BUG=aomedia:135

Change-Id: Ic8c3ae9ed65d577df629524b617b386b5e799d4c

av1/common/scan.c

diff --git a/av1/common/scan.c b/av1/common/scan.c
index 7522a72..ea41c29 100644
--- a/av1/common/scan.c
+++ b/av1/common/scan.c
@@ -6493,6 +6493,9 @@
 static uint32_t *get_non_zero_prob(FRAME_CONTEXT *fc, TX_SIZE tx_size,
                                    TX_TYPE tx_type) {
   switch (tx_size) {
+#if CONFIG_CB4X4
+    case TX_2X2: return fc->non_zero_prob_2x2[tx_type];
+#endif
     case TX_4X4: return fc->non_zero_prob_4X4[tx_type];
     case TX_8X8: return fc->non_zero_prob_8X8[tx_type];
     case TX_16X16: return fc->non_zero_prob_16X16[tx_type];
@@ -6504,6 +6507,9 @@
 static int16_t *get_adapt_scan(FRAME_CONTEXT *fc, TX_SIZE tx_size,
                                TX_TYPE tx_type) {
   switch (tx_size) {
+#if CONFIG_CB4X4
+    case TX_2X2: return fc->scan_2x2[tx_type];
+#endif
     case TX_4X4: return fc->scan_4X4[tx_type];
     case TX_8X8: return fc->scan_8X8[tx_type];
     case TX_16X16: return fc->scan_16X16[tx_type];
@@ -6515,6 +6521,9 @@
 static int16_t *get_adapt_iscan(FRAME_CONTEXT *fc, TX_SIZE tx_size,
                                 TX_TYPE tx_type) {
   switch (tx_size) {
+#if CONFIG_CB4X4
+    case TX_2X2: return fc->iscan_2x2[tx_type];
+#endif
     case TX_4X4: return fc->iscan_4X4[tx_type];
     case TX_8X8: return fc->iscan_8X8[tx_type];
     case TX_16X16: return fc->iscan_16X16[tx_type];
@@ -6526,6 +6535,9 @@
 static int16_t *get_adapt_nb(FRAME_CONTEXT *fc, TX_SIZE tx_size,
                              TX_TYPE tx_type) {
   switch (tx_size) {
+#if CONFIG_CB4X4
+    case TX_2X2: return fc->nb_2x2[tx_type];
+#endif
     case TX_4X4: return fc->nb_4X4[tx_type];
     case TX_8X8: return fc->nb_8X8[tx_type];
     case TX_16X16: return fc->nb_16X16[tx_type];
@@ -6537,6 +6549,9 @@
 static uint32_t *get_non_zero_counts(FRAME_COUNTS *counts, TX_SIZE tx_size,
                                      TX_TYPE tx_type) {
   switch (tx_size) {
+#if CONFIG_CB4X4
+    case TX_2X2: return counts->non_zero_count_2x2[tx_type];
+#endif
     case TX_4X4: return counts->non_zero_count_4X4[tx_type];
     case TX_8X8: return counts->non_zero_count_8X8[tx_type];
     case TX_16X16: return counts->non_zero_count_16X16[tx_type];
@@ -6716,7 +6731,7 @@
 void av1_init_scan_order(AV1_COMMON *cm) {
   TX_SIZE tx_size;
   TX_TYPE tx_type;
-  for (tx_size = TX_4X4; tx_size < TX_SIZES; ++tx_size) {
+  for (tx_size = 0; tx_size < TX_SIZES; ++tx_size) {
     for (tx_type = DCT_DCT; tx_type < TX_TYPES; ++tx_type) {
       uint32_t *non_zero_prob = get_non_zero_prob(cm->fc, tx_size, tx_type);
       const int tx2d_size = tx_size_2d[tx_size];