commit 27319b6eecfd444ee442d934271277175828bed3
author Lester Lu <kslu@google.com> Mon Jul 10 16:57:15 2017 -0700
committer Lester Lu <kslu@google.com> Mon Jul 17 17:54:24 2017 +0000
tree dfc5764f57e0974f681495e0fad7f7b2590ca082
parent d27f5e270e1f33287e7f6f2bec558dc1c44a0804

Unify FWD_TXFM_PARAM and INV_TXFM_PARAM

Change two similar structs, FWD_TXFM_PARAM and INV_TXFM_PARAM,
into a common struct: TxfmParam. Its definition is moved to
aom_dsp/txfm_common.h to simplify dependency.

This change is made so that, in later changes of the LGT
experiment, functions requiring FWD_TXFM_PARAM and
INV_TXFM_PARAM, such as get_fwd_lgt4 and get_inv_lgt4, can
also be unified.

Change-Id: I756b0176a02314005060adbf8e62386f10eeb344

av1/common/idct.h

diff --git a/av1/common/idct.h b/av1/common/idct.h
index 0591d4a..c2ca69b 100644
--- a/av1/common/idct.h
+++ b/av1/common/idct.h
@@ -26,38 +26,7 @@
 extern "C" {
 #endif
 
-// TODO(kslu) Combine FWD_TXFM_PARAM and INV_TXFM_PARAM into a common struct.
-// and move the common stuff in idct.h to av1_txfm.h or txfm_common.h
-typedef struct fwd_txfm_param {
-  TX_TYPE tx_type;
-  TX_SIZE tx_size;
-  int lossless;
-  int bd;
-#if CONFIG_LGT
-  int is_inter;
-  int stride;
-  PREDICTION_MODE mode;
-  uint8_t *dst;
-#endif
-} FWD_TXFM_PARAM;
-
-typedef struct inv_txfm_param {
-#if CONFIG_ADAPT_SCAN
-  const int16_t *eob_threshold;
-#endif
-  TX_TYPE tx_type;
-  TX_SIZE tx_size;
-  int eob;
-  int lossless;
-  int bd;
-#if CONFIG_LGT
-  int is_inter;
-  int stride;
-  PREDICTION_MODE mode;
-  uint8_t *dst;
-#endif
-} INV_TXFM_PARAM;
-
+// TODO(kslu) move the common stuff in idct.h to av1_txfm.h or txfm_common.h
 typedef void (*transform_1d)(const tran_low_t *, tran_low_t *);
 
 typedef struct {
@@ -76,12 +45,12 @@
 int av1_get_tx_scale(const TX_SIZE tx_size);
 
 void av1_iwht4x4_add(const tran_low_t *input, uint8_t *dest, int stride,
-                     const INV_TXFM_PARAM *inv_txfm_param);
+                     const TxfmParam *txfm_param);
 void av1_idct4x4_add(const tran_low_t *input, uint8_t *dest, int stride,
-                     const INV_TXFM_PARAM *inv_txfm_param);
+                     const TxfmParam *txfm_param);
 
 void av1_inv_txfm_add(const tran_low_t *input, uint8_t *dest, int stride,
-                      INV_TXFM_PARAM *inv_txfm_param);
+                      TxfmParam *txfm_param);
 void av1_inverse_transform_block(const MACROBLOCKD *xd,
                                  const tran_low_t *dqcoeff,
 #if CONFIG_LGT
@@ -95,13 +64,13 @@
 void av1_highbd_iwht4x4_add(const tran_low_t *input, uint8_t *dest, int stride,
                             int eob, int bd);
 void av1_highbd_inv_txfm_add_4x4(const tran_low_t *input, uint8_t *dest,
-                                 int stride, const INV_TXFM_PARAM *param);
+                                 int stride, const TxfmParam *param);
 void av1_highbd_inv_txfm_add_4x8(const tran_low_t *input, uint8_t *dest,
-                                 int stride, const INV_TXFM_PARAM *param);
+                                 int stride, const TxfmParam *param);
 void av1_highbd_inv_txfm_add_8x4(const tran_low_t *input, uint8_t *dest,
-                                 int stride, const INV_TXFM_PARAM *param);
+                                 int stride, const TxfmParam *param);
 void av1_highbd_inv_txfm_add(const tran_low_t *input, uint8_t *dest, int stride,
-                             INV_TXFM_PARAM *inv_txfm_param);
+                             TxfmParam *txfm_param);
 
 #if CONFIG_DPCM_INTRA
 void av1_dpcm_inv_txfm_add_4_c(const tran_low_t *input, int stride,