commit 7e32a4cc341399debf99401b463be3b674754360
author Jingning Han <jingning@google.com> Wed Apr 12 10:43:17 2017 -0700
committer Jingning Han <jingning@google.com> Wed Apr 12 20:07:29 2017 +0000
tree 0c88d72bfa608e1201669e503efeea87e134e615
parent 65113f38c8842c06dde00b30e1d7d19a1d4f0d80

Fix high bit-depth transform unit test failure

BUG=aomedia:430

Change-Id: I1e6fc42163b94f221d3010f00bb5e085707687c8

test/av1_txfm_test.cc

diff --git a/test/av1_txfm_test.cc b/test/av1_txfm_test.cc
index fd084f0..1e473b3 100644
--- a/test/av1_txfm_test.cc
+++ b/test/av1_txfm_test.cc
@@ -14,7 +14,7 @@
 
 namespace libaom_test {
 
-int get_txfm1d_size(TX_SIZE tx_size) { return 1 << (tx_size + 2); }
+int get_txfm1d_size(TX_SIZE tx_size) { return tx_size_wide[tx_size]; }
 
 void get_txfm1d_type(TX_TYPE txfm2d_type, TYPE_TXFM *type0, TYPE_TXFM *type1) {
   switch (txfm2d_type) {

test/av1_txfm_test.h

diff --git a/test/av1_txfm_test.h b/test/av1_txfm_test.h
index 6d54786..a4b10dc 100644
--- a/test/av1_txfm_test.h
+++ b/test/av1_txfm_test.h
@@ -79,12 +79,18 @@
 #if CONFIG_AOM_HIGHBITDEPTH
 #if CONFIG_AV1_ENCODER
 static const Fwd_Txfm2d_Func fwd_txfm_func_ls[TX_SIZES] = {
+#if CONFIG_CB4X4
+  NULL,
+#endif
   av1_fwd_txfm2d_4x4_c, av1_fwd_txfm2d_8x8_c, av1_fwd_txfm2d_16x16_c,
   av1_fwd_txfm2d_32x32_c
 };
 #endif
 
 static const Inv_Txfm2d_Func inv_txfm_func_ls[TX_SIZES] = {
+#if CONFIG_CB4X4
+  NULL,
+#endif
   av1_inv_txfm2d_add_4x4_c, av1_inv_txfm2d_add_8x8_c,
   av1_inv_txfm2d_add_16x16_c, av1_inv_txfm2d_add_32x32_c
 };