commit 2cc057cf1f92db943f6a481aa97a9ff1ffc65359
author Angie Chiang <angiebird@google.com> Tue Jan 03 18:31:47 2017 -0800
committer Angie Chiang <angiebird@google.com> Wed Jan 04 22:37:04 2017 +0000
tree 9816bdde3cdb4bdc032d580dadc007b8cb7d6ee5
parent 409c0bb27ea959cb0c309daa786bcd3668ee6cc8

Remove fwd_txfm_opt

This CL aims at simplify transform code.

Change-Id: Ibaf1dd8607e37d44a0f77788a72e344583f81fa0

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 63be199..c70616d 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -472,14 +472,6 @@
                                        };
 #endif
 
-static FWD_TXFM_OPT fwd_txfm_opt_list[AV1_XFORM_QUANT_TYPES] = {
-  FWD_TXFM_OPT_NORMAL, FWD_TXFM_OPT_NORMAL, FWD_TXFM_OPT_DC,
-#if CONFIG_NEW_QUANT
-  FWD_TXFM_OPT_NORMAL, FWD_TXFM_OPT_NORMAL, FWD_TXFM_OPT_DC,
-#endif  // CONFIG_NEW_QUANT
-  FWD_TXFM_OPT_NORMAL
-};
-
 void av1_xform_quant(const AV1_COMMON *cm, MACROBLOCK *x, int plane, int block,
                      int blk_row, int blk_col, BLOCK_SIZE plane_bsize,
                      TX_SIZE tx_size, int ctx,
@@ -565,7 +557,6 @@
 
   fwd_txfm_param.tx_type = tx_type;
   fwd_txfm_param.tx_size = tx_size;
-  fwd_txfm_param.fwd_txfm_opt = fwd_txfm_opt_list[xform_quant_idx];
   fwd_txfm_param.lossless = xd->lossless[xd->mi[0]->mbmi.segment_id];
 
 #if CONFIG_AOM_HIGHBITDEPTH
@@ -596,6 +587,7 @@
   }
 #else   // #if !CONFIG_PVQ
 
+  (void)xform_quant_idx;
   fwd_txfm(src_int16, coeff, diff_stride, &fwd_txfm_param);
   fwd_txfm(pred, ref_coeff, diff_stride, &fwd_txfm_param);