commit 4007fa6852e6fe793d1a00b1826682bbf3581c7c
author Yaowu Xu <yaowu@google.com> Mon Nov 07 22:03:00 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 07 22:03:01 2016 +0000
tree 7001e53a8cc6690ddbfbd0a89b93a1b1bcfcbd6b
parent c4c21734d68013a5dad309735248f6d07074b4fa
parent 3442b4b1591ea7418d61b225c4e6e39c6076fe04

Merge "change to call fwd_txfm()" into nextgenv2

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 9e5419f..c8841e3 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4612,9 +4612,17 @@
               dst[dst_stride * (j + 4 * idy) + (ii + 4 * idx)];
         }
 
-      fwd_txm4x4(src_int16, coeff, diff_stride);
-      fwd_txm4x4(pred, ref_coeff, diff_stride);
+      {
+        FWD_TXFM_PARAM fwd_txfm_param;
+        fwd_txfm_param.tx_type = DCT_DCT;
+        fwd_txfm_param.tx_size = TX_4X4;
+        fwd_txfm_param.fwd_txfm_opt = FWD_TXFM_OPT_NORMAL;
+        fwd_txfm_param.rd_transform = 0;
+        fwd_txfm_param.lossless = xd->lossless[xd->mi[0]->mbmi.segment_id];
 
+        fwd_txfm(src_int16, coeff, diff_stride, &fwd_txfm_param);
+        fwd_txfm(pred, ref_coeff, diff_stride, &fwd_txfm_param);
+      }
       av1_pvq_encode_helper(&x->daala_enc, coeff, ref_coeff, dqcoeff,
                             &p->eobs[k], pd->dequant, 0, TX_4X4, tx_type,
                             &rate_pvq, x->pvq_speed, NULL);