commit 05685a2f1284f735188809b27a7dfccd7ebb6520
author Yaowu Xu <yaowu@google.com> Thu Oct 05 09:55:48 2017 -0700
committer Yaowu Xu <yaowu@google.com> Thu Oct 05 21:28:33 2017 +0000
tree 46ed71d104468601f49bca6bff6b562cbf6db092
parent 4494ae4c680561c76c386d5a8d2593997de49f83

update ScanTest to use large transform size

The scan order functions have been changed to support downsmaple for
large transform only, this commit updates the test to reflect the
change and avoid assertion.

BUG=aomedia:873

Change-Id: I63ca607847b68050ac3f9f54077f4f904a8e1ecd

test/scan_test.cc

diff --git a/test/scan_test.cc b/test/scan_test.cc
index a2ca724..ef5d684 100644
--- a/test/scan_test.cc
+++ b/test/scan_test.cc
@@ -96,12 +96,28 @@
 
 #if USE_2X2_PROB
 TEST(ScanTest, av1_down_sample_scan_count) {
-  const uint32_t non_zero_count[16] = { 13, 12, 11, 10, 13, 9, 10, 8,
-                                        11, 12, 9,  8,  13, 9, 9,  10 };
-  const uint32_t ref_non_zero_count_ds[4] = { 47, 39, 45, 36 };
-  uint32_t non_zero_count_ds[4];
-  av1_down_sample_scan_count(non_zero_count_ds, non_zero_count, TX_4X4);
-  for (int i = 0; i < 4; ++i) {
+  const uint32_t non_zero_count[256] = {
+    13, 12, 11, 10, 0,  0, 0, 0,  0, 0, 0,  0,  0, 0, 0, 0, 13, 9, 10, 8, 0, 0,
+    0,  0,  0,  0,  0,  0, 0, 0,  0, 0, 11, 12, 9, 8, 0, 0, 0,  0, 0,  0, 0, 0,
+    0,  0,  0,  0,  13, 9, 9, 10, 0, 0, 0,  0,  0, 0, 0, 0, 0,  0, 0,  0, 0, 0,
+    0,  0,  0,  0,  0,  0, 0, 0,  0, 0, 0,  0,  0, 0, 0, 0, 0,  0, 0,  0, 0, 0,
+    0,  0,  0,  0,  0,  0, 0, 0,  0, 0, 0,  0,  0, 0, 0, 0, 0,  0, 0,  0, 0, 0,
+    0,  0,  0,  0,  0,  0, 0, 0,  0, 0, 0,  0,  0, 0, 0, 0, 0,  0, 0,  0, 0, 0,
+    0,  0,  0,  0,  0,  0, 0, 0,  0, 0, 0,  0,  0, 0, 0, 0, 0,  0, 0,  0, 0, 0,
+    0,  0,  0,  0,  0,  0, 0, 0,  0, 0, 0,  0,  0, 0, 0, 0, 0,  0, 0,  0, 0, 0,
+    0,  0,  0,  0,  0,  0, 0, 0,  0, 0, 0,  0,  0, 0, 0, 0, 0,  0, 0,  0, 0, 0,
+    0,  0,  0,  0,  0,  0, 0, 0,  0, 0, 0,  0,  0, 0, 0, 0, 0,  0, 0,  0, 0, 0,
+    0,  0,  0,  0,  0,  0, 0, 0,  0, 0, 0,  0,  0, 0, 0, 0, 0,  0, 0,  0, 0, 0,
+    0,  0,  0,  0,  0,  0, 0, 0,  0, 0, 0,  0,  0, 0,
+  };
+  const uint32_t ref_non_zero_count_ds[64] = {
+    13, 11, 0, 0, 0, 0, 0, 0, 11, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0,  0,  0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0,  0,  0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  };
+  uint32_t non_zero_count_ds[64];
+  av1_down_sample_scan_count(non_zero_count_ds, non_zero_count, TX_16X16);
+  for (int i = 0; i < 64; ++i) {
     EXPECT_EQ(ref_non_zero_count_ds[i], non_zero_count_ds[i]);
   }
 }