Do not use avx2 quantizer for 4:1 transforms

Change-Id: I4b1a386ff989d63c7230923b36cb230b18466143

av1/encoder/av1_quantize.c

@@ -595,10 +595,19 @@ void av1_quantize_fp_facade(const tran_low_t *coeff_ptr, intptr_t n_coeffs,
                                p->dequant_QTX, eob_ptr, sc->scan, sc->iscan,
                                NULL, NULL, qparam->log_scale);
         } else {
-          av1_quantize_fp(coeff_ptr, n_coeffs, skip_block, p->zbin_QTX,
-                          p->round_fp_QTX, p->quant_fp_QTX, p->quant_shift_QTX,
-                          qcoeff_ptr, dqcoeff_ptr, p->dequant_QTX, eob_ptr,
-                          sc->scan, sc->iscan);
+#if CONFIG_RECT_TX_EXT
+          if (qparam->tx_size == TX_4X16 || qparam->tx_size == TX_16X4 ||
+              qparam->tx_size == TX_8X32 || qparam->tx_size == TX_32X8)
+            av1_quantize_fp_c(coeff_ptr, n_coeffs, skip_block, p->zbin_QTX,
+                              p->round_fp_QTX, p->quant_fp_QTX,
+                              p->quant_shift_QTX, qcoeff_ptr, dqcoeff_ptr,
+                              p->dequant_QTX, eob_ptr, sc->scan, sc->iscan);
+          else
+#endif  // CONFIG_RECT_TX_EXT
+            av1_quantize_fp(coeff_ptr, n_coeffs, skip_block, p->zbin_QTX,
+                            p->round_fp_QTX, p->quant_fp_QTX,
+                            p->quant_shift_QTX, qcoeff_ptr, dqcoeff_ptr,
+                            p->dequant_QTX, eob_ptr, sc->scan, sc->iscan);
         }
         break;
       case 1:

av1/encoder/av1_quantize.h

@@ -23,8 +23,8 @@ extern "C" {
 
 typedef struct QUANT_PARAM {
   int log_scale;
-#if CONFIG_NEW_QUANT
   TX_SIZE tx_size;
+#if CONFIG_NEW_QUANT
   int dq;
 #endif  // CONFIG_NEW_QUANT
 #if CONFIG_AOM_QM

av1/encoder/encodemb.c

@@ -549,8 +549,8 @@ void av1_xform_quant(const AV1_COMMON *cm, MACROBLOCK *x, int plane, int block,
 #else
   qparam.log_scale = av1_get_tx_scale(tx_size);
 #endif
-#if CONFIG_NEW_QUANT
   qparam.tx_size = tx_size;
+#if CONFIG_NEW_QUANT
   qparam.dq = get_dq_profile_from_ctx(x->qindex, ctx, is_inter, plane_type);
 #endif  // CONFIG_NEW_QUANT
 #if CONFIG_AOM_QM