commit aa8c60d34a057f28cc595509202b9296ecee3432
author Jerome Jiang <jianj@google.com> Fri Apr 16 12:38:04 2021 -0700
committer Jerome Jiang <jianj@google.com> Wed Jun 09 23:04:59 2021 +0000
tree 30d601bf41a0f41b7a28633a9663857d5fd8a5e4
parent 398f64ecfa79421e76cf1b2b564d3bc4e5e6bfcb

Cosmetic: condition/error message on 4x rect txfm

Bug: aomedia:3001
Change-Id: I5c292a5ed5370181f389209532f5cdb6782ff162

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 9ca7d3c..6fb4eb0 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -917,12 +917,10 @@
           const TX_SIZE tx_size = av1_get_tx_size(plane, xd);
 #if CONFIG_REALTIME_ONLY
           // Realtime only build doesn't support 4x rectangular txfm sizes.
-          if (tx_size == TX_4X16 || tx_size == TX_16X4 || tx_size == TX_8X32 ||
-              tx_size == TX_32X8 || tx_size == TX_16X64 ||
-              tx_size == TX_64X16) {
-            aom_internal_error(
-                xd->error_info, AOM_CODEC_UNSUP_FEATURE,
-                "Realtime only build doesn't support rectangular txfm sizes");
+          if (tx_size >= TX_4X16) {
+            aom_internal_error(xd->error_info, AOM_CODEC_UNSUP_FEATURE,
+                               "Realtime only build doesn't support 4x "
+                               "rectangular txfm sizes");
           }
 #endif
           const int stepr = tx_size_high_unit[tx_size];

test/av1_highbd_iht_test.cc

diff --git a/test/av1_highbd_iht_test.cc b/test/av1_highbd_iht_test.cc
index 165abc9..137cd09 100644
--- a/test/av1_highbd_iht_test.cc
+++ b/test/av1_highbd_iht_test.cc
@@ -211,8 +211,7 @@
                                              int run_times, int bit_depth_,
                                              int gt_int16) {
 #if CONFIG_REALTIME_ONLY
-  if (tx_size_ == TX_4X16 || tx_size_ == TX_16X4 || tx_size_ == TX_8X32 ||
-      tx_size_ == TX_32X8 || tx_size_ == TX_16X64 || tx_size_ == TX_64X16) {
+  if (tx_size_ >= TX_4X16) {
     return;
   }
 #endif