commit c32fb59bf02ff5059c8f560a516a5b2e7a16fe06
author Debargha Mukherjee <debargha@google.com> Fri Aug 21 19:23:43 2020 -0700
committer Debargha Mukherjee <debargha@google.com> Sat Aug 22 03:50:47 2020 +0000
tree f4411cdcad6907af1c4de4a9d1ca0a560264ef02
parent afa74198143e9e966b2f360eaef95b6f99d4266d

Fix missing TX_4X4 case in nonrd_pickmode

Change-Id: Iba535545bfcf0adfb7b69b60ee292286fcea3126
(cherry picked from commit 2165ef9ce903340672847f24ffe6dce0ccc6c9ca)

av1/encoder/nonrd_pickmode.c

diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index dfa2c5e..9df1d60 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -916,6 +916,14 @@
                             dqcoeff, p->dequant_QTX, eob, scan_order->scan,
                             scan_order->iscan);
             break;
+          default:
+            assert(tx_size == TX_4X4);
+            aom_fdct4x4(src_diff, coeff, diff_stride);
+            av1_quantize_fp(coeff, 4 * 4, p->zbin_QTX, p->round_fp_QTX,
+                            p->quant_fp_QTX, p->quant_shift_QTX, qcoeff,
+                            dqcoeff, p->dequant_QTX, eob, scan_order->scan,
+                            scan_order->iscan);
+            break;
 #else
           case TX_16X16:
             aom_hadamard_lp_16x16(src_diff, diff_stride, low_coeff);
@@ -938,6 +946,7 @@
             break;
 #endif
         }
+        assert(*eob <= 1024);
         *skippable &= (*eob == 0);
         eob_cost += 1;
       }