ref: be99868bd16fd46c7009e7052131705c116bda5a
parent: 8a9a11e8dca2d1ee5d4893d0534ba376baf3bb6c
author: Fritz Koenig <frkoenig@google.com>
date: Mon Jun 27 05:43:21 EDT 2011
Fix after removal of B_MODE_INFO Change Ieb746989: Removed B_MODE_INFO missed this. Change-Id: I32202555581cc2a5d45e729c6650ada4d2df55d3
--- a/vp8/common/postproc.c
+++ b/vp8/common/postproc.c
@@ -837,7 +837,6 @@
YV12_BUFFER_CONFIG *post = &oci->post_proc_buffer;
int width = post->y_width;
int height = post->y_height;
- int mb_cols = width >> 4;
unsigned char *y_buffer = oci->post_proc_buffer.y_buffer;
int y_stride = oci->post_proc_buffer.y_stride;
MODE_INFO *mi = oci->mi;
@@ -861,7 +860,7 @@
{case 0 : /* mv_top_bottom */
{- B_MODE_INFO *bmi = &mi->bmi[0];
+ union b_mode_info *bmi = &mi->bmi[0];
MV *mv = &bmi->mv.as_mv;
x1 = x0 + 8 + (mv->col >> 3);
@@ -882,7 +881,7 @@
}
case 1 : /* mv_left_right */
{- B_MODE_INFO *bmi = &mi->bmi[0];
+ union b_mode_info *bmi = &mi->bmi[0];
MV *mv = &bmi->mv.as_mv;
x1 = x0 + 4 + (mv->col >> 3);
@@ -903,7 +902,7 @@
}
case 2 : /* mv_quarters */
{- B_MODE_INFO *bmi = &mi->bmi[0];
+ union b_mode_info *bmi = &mi->bmi[0];
MV *mv = &bmi->mv.as_mv;
x1 = x0 + 4 + (mv->col >> 3);
@@ -939,7 +938,7 @@
}
default :
{- B_MODE_INFO *bmi = mi->bmi;
+ union b_mode_info *bmi = mi->bmi;
int bx0, by0;
for (by0 = y0; by0 < (y0+16); by0 += 4)
@@ -1012,7 +1011,7 @@
{int by, bx;
unsigned char *yl, *ul, *vl;
- B_MODE_INFO *bmi = mi->bmi;
+ union b_mode_info *bmi = mi->bmi;
yl = y_ptr + x;
ul = u_ptr + (x>>1);
@@ -1025,9 +1024,9 @@
if ((ppflags->display_b_modes_flag & (1<<mi->mbmi.mode))
|| (ppflags->display_mb_modes_flag & B_PRED))
{- Y = B_PREDICTION_MODE_colors[bmi->mode][0];
- U = B_PREDICTION_MODE_colors[bmi->mode][1];
- V = B_PREDICTION_MODE_colors[bmi->mode][2];
+ Y = B_PREDICTION_MODE_colors[bmi->as_mode][0];
+ U = B_PREDICTION_MODE_colors[bmi->as_mode][1];
+ V = B_PREDICTION_MODE_colors[bmi->as_mode][2];
POSTPROC_INVOKE(RTCD_VTABLE(oci), blend_b)
(yl+bx, ul+(bx>>1), vl+(bx>>1), Y, U, V, 0xc000, y_stride);
--
⑨