commit d3d4159fcd91f2df97c6e40fe02b90e7ca0c1118
author Yaowu Xu <yaowu@google.com> Wed Feb 14 13:26:52 2018 -0800
committer Urvang Joshi <urvang@google.com> Thu Feb 15 19:21:28 2018 +0000
tree c7f7cd6527647a58cfaf2192aebfefb025c4d241
parent 1fc3df55e3c2e270fce7b6ddb7b6864d668b4451

Remove CONFIG_TX64X64

The experiment is fully adopted.

Change-Id: I6cc80a2acf0c93c13b0e36e6f4a2378fe5ce33c3

aom_dsp/quantize.h

diff --git a/aom_dsp/quantize.h b/aom_dsp/quantize.h
index 2f58bce..f2c4957 100644
--- a/aom_dsp/quantize.h
+++ b/aom_dsp/quantize.h
@@ -60,12 +60,10 @@
                            const int16_t *round_ptr, const int16_t quant_ptr,
                            tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr,
                            const int16_t dequant_ptr, uint16_t *eob_ptr);
-#if CONFIG_TX64X64
 void aom_quantize_dc_64x64(const tran_low_t *coeff_ptr, int skip_block,
                            const int16_t *round_ptr, const int16_t quant_ptr,
                            tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr,
                            const int16_t dequant_ptr, uint16_t *eob_ptr);
-#endif  // CONFIG_TX64X64
 
 #if CONFIG_AOM_QM
 void aom_highbd_quantize_dc(const tran_low_t *coeff_ptr, int n_coeffs,
@@ -79,15 +77,13 @@
     const int16_t quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr,
     const int16_t dequant_ptr, uint16_t *eob_ptr, const qm_val_t *qm_ptr,
     const qm_val_t *iqm_ptr);
-#if CONFIG_TX64X64
 void aom_highbd_quantize_dc_64x64(
     const tran_low_t *coeff_ptr, int skip_block, const int16_t *round_ptr,
     const int16_t quant_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr,
     const int16_t dequant_ptr, uint16_t *eob_ptr, const qm_val_t *qm_ptr,
     const qm_val_t *iqm_ptr);
-#endif  // CONFIG_TX64X64
 
-#else  // CONFIG_AOM_QM
+#else   // CONFIG_AOM_QM
 
 void aom_highbd_quantize_dc(const tran_low_t *coeff_ptr, int n_coeffs,
                             int skip_block, const int16_t *round_ptr,
@@ -100,14 +96,12 @@
                                   tran_low_t *qcoeff_ptr,
                                   tran_low_t *dqcoeff_ptr,
                                   const int16_t dequant_ptr, uint16_t *eob_ptr);
-#if CONFIG_TX64X64
 void aom_highbd_quantize_dc_64x64(const tran_low_t *coeff_ptr, int skip_block,
                                   const int16_t *round_ptr,
                                   const int16_t quant_ptr,
                                   tran_low_t *qcoeff_ptr,
                                   tran_low_t *dqcoeff_ptr,
                                   const int16_t dequant_ptr, uint16_t *eob_ptr);
-#endif  // CONFIG_TX64X64
 #endif  // CONFIG_AOM_QM
 
 #ifdef __cplusplus