commit 8e7b0e43ea60c7e9f60d0a427ebdedb58d569f6f
author Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Fri Mar 16 16:38:55 2018 +0100
committer Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Sat Mar 17 16:36:30 2018 +0000
tree 4f8145ba61de87a09471ff53ead20a857f240ebb
parent 190b77ab5340ac031e82a722b3d2dbdcf50fece5

Don't use obsolete non-scaled tx for pass #1

This is the last user of the non-scaled transforms.
After this, the whole file "aom_dsp/inv_txfm.c" can be removed.

Change-Id: Ib845d81daaf009984daaec526fcb5dccebac01f3

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 8cfd36d..131ee1d 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -344,26 +344,6 @@
   MACROBLOCK *x;
 } encode_block_pass1_args;
 
-static void iwht4x4_add(const tran_low_t *input, uint8_t *dest, int stride,
-                        const TxfmParam *txfm_param) {
-  assert(av1_ext_tx_used[txfm_param->tx_set_type][txfm_param->tx_type]);
-  const int eob = txfm_param->eob;
-  if (eob > 1)
-    aom_iwht4x4_16_add(input, dest, stride);
-  else
-    aom_iwht4x4_1_add(input, dest, stride);
-}
-
-static void idct4x4_add(const tran_low_t *input, uint8_t *dest, int stride,
-                        const TxfmParam *txfm_param) {
-  assert(av1_ext_tx_used[txfm_param->tx_set_type][txfm_param->tx_type]);
-  const int eob = txfm_param->eob;
-  if (eob > 1)
-    av1_iht4x4_16_add(input, dest, stride, txfm_param);
-  else
-    aom_idct4x4_1_add(input, dest, stride);
-}
-
 static void encode_block_pass1(int plane, int block, int blk_row, int blk_col,
                                BLOCK_SIZE plane_bsize, TX_SIZE tx_size,
                                void *arg) {
@@ -396,11 +376,7 @@
       av1_highbd_inv_txfm_add_4x4(dqcoeff, dst, pd->dst.stride, &txfm_param);
       return;
     }
-    if (xd->lossless[xd->mi[0]->mbmi.segment_id]) {
-      iwht4x4_add(dqcoeff, dst, pd->dst.stride, &txfm_param);
-    } else {
-      idct4x4_add(dqcoeff, dst, pd->dst.stride, &txfm_param);
-    }
+    av1_inv_txfm_add(dqcoeff, dst, pd->dst.stride, &txfm_param);
   }
 }