added 8x8 based Rate estimation for dualpred case
authorYaowu Xu <yaowu@google.com>
Mon, 13 Feb 2012 22:34:19 +0000 (14:34 -0800)
committerPaul Wilkins <paulwilkins@google.com>
Tue, 14 Feb 2012 09:23:21 +0000 (09:23 +0000)
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

vp8/encoder/rdopt.c

index 10fe97e..69dd9ad 100644 (file)
@@ -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;