summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2012-02-13 14:34:19 -0800
committerPaul Wilkins <paulwilkins@google.com>2012-02-14 09:23:21 +0000
commit9b68ad0f30c8f4875a5aec5c3f09c3898b820e5f (patch)
treea3f083b425d5e25489ff24b6b3d2ee987124d912
parent9a8204d6ee0f2d2d7a64d22aadfd567552a44db7 (diff)
downloadlibvpx-9b68ad0f30c8f4875a5aec5c3f09c3898b820e5f.tar
libvpx-9b68ad0f30c8f4875a5aec5c3f09c3898b820e5f.tar.gz
libvpx-9b68ad0f30c8f4875a5aec5c3f09c3898b820e5f.tar.bz2
libvpx-9b68ad0f30c8f4875a5aec5c3f09c3898b820e5f.zip
added 8x8 based Rate estimation for dualpred case
This commmit added logic for MB using dual-pred to compute rate estimation based on correct transform size. The section of code was previously located under #if CONFIG_DUALPRED, that was made to be working with T8x8 experiment at the same time. Change-Id: Iebc2518c03f11378b9c2e72905520f088b54d5c0
-rw-r--r--vp8/encoder/rdopt.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 10fe97e68..69dd9adc7 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -2855,7 +2855,15 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
&x->e_mbd.predictor[320], 16, 8);
/* Y cost and distortion */
- macro_block_yrd(x, &rate_y, &distortion, IF_RTCD(&cpi->rtcd.encodemb));
+#if CONFIG_T8X8
+ if(cpi->common.txfm_mode == ALLOW_8X8)
+ macro_block_yrd_8x8(x, &rate_y, &distortion,
+ IF_RTCD(&cpi->rtcd));
+ else
+#endif
+ macro_block_yrd(x, &rate_y, &distortion,
+ IF_RTCD(&cpi->rtcd.encodemb));
+
rate2 += rate_y;
distortion2 += distortion;