Commit 62371d38 authored by John Koleszar's avatar John Koleszar
Browse files

Merge remote branch 'internal/upstream' into HEAD

Conflicts:
	vp8/decoder/decodframe.c
	vp8/encoder/encodeframe.c
	vp8/encoder/encodemb.c

Change-Id: I6e0d1669e4409a2dfd73ba2c7038d730842d3953
parents 3b5f8adc e47306eb
...@@ -34,8 +34,8 @@ MD5Init(&md5); ...@@ -34,8 +34,8 @@ MD5Init(&md5);
for(plane=0; plane < 3; plane++) { for(plane=0; plane < 3; plane++) {
unsigned char *buf =img->planes[plane]; unsigned char *buf =img->planes[plane];
for(y=0; y<img->d_h >> (plane?1:0); y++) { for(y=0; y < (plane ? (img->d_h + 1) >> 1 : img->d_h); y++) {
MD5Update(&md5, buf, img->d_w >> (plane?1:0)); MD5Update(&md5, buf, (plane ? (img->d_w + 1) >> 1 : img->d_w));
buf += img->stride[plane]; buf += img->stride[plane];
} }
} }
......
...@@ -47,8 +47,9 @@ while((img = vpx_codec_get_frame(&codec, &iter))) { ...@@ -47,8 +47,9 @@ while((img = vpx_codec_get_frame(&codec, &iter))) {
for(plane=0; plane < 3; plane++) { for(plane=0; plane < 3; plane++) {
unsigned char *buf =img->planes[plane]; unsigned char *buf =img->planes[plane];
for(y=0; y<img->d_h >> (plane?1:0); y++) { for(y=0; y < (plane ? (img->d_h + 1) >> 1 : img->d_h); y++) {
if(fwrite(buf, 1, img->d_w >> (plane?1:0), outfile)); if(fwrite(buf, 1, (plane ? (img->d_w + 1) >> 1 : img->d_w),
outfile));
buf += img->stride[plane]; buf += img->stride[plane];
} }
} }
......
...@@ -215,6 +215,7 @@ typedef struct MacroBlockD ...@@ -215,6 +215,7 @@ typedef struct MacroBlockD
/* 16 Y blocks, 4 U, 4 V, 1 DC 2nd order block, each with 16 entries. */ /* 16 Y blocks, 4 U, 4 V, 1 DC 2nd order block, each with 16 entries. */
BLOCKD block[25]; BLOCKD block[25];
int fullpixel_mask;
YV12_BUFFER_CONFIG pre; /* Filtered copy of previous frame reconstruction */ YV12_BUFFER_CONFIG pre; /* Filtered copy of previous frame reconstruction */
YV12_BUFFER_CONFIG dst; YV12_BUFFER_CONFIG dst;
...@@ -305,20 +306,4 @@ typedef struct MacroBlockD ...@@ -305,20 +306,4 @@ typedef struct MacroBlockD
extern void vp8_build_block_doffsets(MACROBLOCKD *x); extern void vp8_build_block_doffsets(MACROBLOCKD *x);
extern void vp8_setup_block_dptrs(MACROBLOCKD *x); extern void vp8_setup_block_dptrs(MACROBLOCKD *x);
static void update_blockd_bmi(MACROBLOCKD *xd)
{
int i;
int is_4x4;
is_4x4 = (xd->mode_info_context->mbmi.mode == SPLITMV) ||
(xd->mode_info_context->mbmi.mode == B_PRED);
if (is_4x4)
{
for (i = 0; i < 16; i++)
{
xd->block[i].bmi = xd->mode_info_context->bmi[i];
}
}
}
#endif /* __INC_BLOCKD_H */ #endif /* __INC_BLOCKD_H */
...@@ -19,10 +19,6 @@ ...@@ -19,10 +19,6 @@
#include "onyxc_int.h" #include "onyxc_int.h"
#endif #endif
static const int bbb[4] = {0, 2, 8, 10};
void vp8_copy_mem16x16_c( void vp8_copy_mem16x16_c(
unsigned char *src, unsigned char *src,
int src_stride, int src_stride,
...@@ -203,21 +199,34 @@ static void build_inter_predictors2b(MACROBLOCKD *x, BLOCKD *d, int pitch) ...@@ -203,21 +199,34 @@ static void build_inter_predictors2b(MACROBLOCKD *x, BLOCKD *d, int pitch)
/*encoder only*/ /*encoder only*/
void vp8_build_inter_predictors_mbuv(MACROBLOCKD *x) void vp8_build_inter16x16_predictors_mbuv(MACROBLOCKD *x)
{ {
int i;
if (x->mode_info_context->mbmi.mode != SPLITMV)
{
unsigned char *uptr, *vptr; unsigned char *uptr, *vptr;
unsigned char *upred_ptr = &x->predictor[256]; unsigned char *upred_ptr = &x->predictor[256];
unsigned char *vpred_ptr = &x->predictor[320]; unsigned char *vpred_ptr = &x->predictor[320];
int mv_row = x->block[16].bmi.mv.as_mv.row; int mv_row = x->mode_info_context->mbmi.mv.as_mv.row;
int mv_col = x->block[16].bmi.mv.as_mv.col; int mv_col = x->mode_info_context->mbmi.mv.as_mv.col;
int offset; int offset;
int pre_stride = x->block[16].pre_stride; int pre_stride = x->block[16].pre_stride;
/* calc uv motion vectors */
if (mv_row < 0)
mv_row -= 1;
else
mv_row += 1;
if (mv_col < 0)
mv_col -= 1;
else
mv_col += 1;
mv_row /= 2;
mv_col /= 2;
mv_row &= x->fullpixel_mask;
mv_col &= x->fullpixel_mask;
offset = (mv_row >> 3) * pre_stride + (mv_col >> 3); offset = (mv_row >> 3) * pre_stride + (mv_col >> 3);
uptr = x->pre.u_buffer + offset; uptr = x->pre.u_buffer + offset;
vptr = x->pre.v_buffer + offset; vptr = x->pre.v_buffer + offset;
...@@ -232,9 +241,51 @@ void vp8_build_inter_predictors_mbuv(MACROBLOCKD *x) ...@@ -232,9 +241,51 @@ void vp8_build_inter_predictors_mbuv(MACROBLOCKD *x)
RECON_INVOKE(&x->rtcd->recon, copy8x8)(uptr, pre_stride, upred_ptr, 8); RECON_INVOKE(&x->rtcd->recon, copy8x8)(uptr, pre_stride, upred_ptr, 8);
RECON_INVOKE(&x->rtcd->recon, copy8x8)(vptr, pre_stride, vpred_ptr, 8); RECON_INVOKE(&x->rtcd->recon, copy8x8)(vptr, pre_stride, vpred_ptr, 8);
} }
} }
else
/*encoder only*/
void vp8_build_inter4x4_predictors_mbuv(MACROBLOCKD *x)
{
int i, j;
/* build uv mvs */
for (i = 0; i < 2; i++)
{ {
for (j = 0; j < 2; j++)
{
int yoffset = i * 8 + j * 2;
int uoffset = 16 + i * 2 + j;
int voffset = 20 + i * 2 + j;
int temp;
temp = x->block[yoffset ].bmi.mv.as_mv.row
+ x->block[yoffset+1].bmi.mv.as_mv.row
+ x->block[yoffset+4].bmi.mv.as_mv.row
+ x->block[yoffset+5].bmi.mv.as_mv.row;
if (temp < 0) temp -= 4;
else temp += 4;
x->block[uoffset].bmi.mv.as_mv.row = (temp / 8) & x->fullpixel_mask;
temp = x->block[yoffset ].bmi.mv.as_mv.col
+ x->block[yoffset+1].bmi.mv.as_mv.col
+ x->block[yoffset+4].bmi.mv.as_mv.col
+ x->block[yoffset+5].bmi.mv.as_mv.col;
if (temp < 0) temp -= 4;
else temp += 4;
x->block[uoffset].bmi.mv.as_mv.col = (temp / 8) & x->fullpixel_mask;
x->block[voffset].bmi.mv.as_mv.row =
x->block[uoffset].bmi.mv.as_mv.row ;
x->block[voffset].bmi.mv.as_mv.col =
x->block[uoffset].bmi.mv.as_mv.col ;
}
}
for (i = 16; i < 24; i += 2) for (i = 16; i < 24; i += 2)
{ {
BLOCKD *d0 = &x->block[i]; BLOCKD *d0 = &x->block[i];
...@@ -248,9 +299,9 @@ void vp8_build_inter_predictors_mbuv(MACROBLOCKD *x) ...@@ -248,9 +299,9 @@ void vp8_build_inter_predictors_mbuv(MACROBLOCKD *x)
vp8_build_inter_predictors_b(d1, 8, x->subpixel_predict); vp8_build_inter_predictors_b(d1, 8, x->subpixel_predict);
} }
} }
}
} }
/*encoder only*/ /*encoder only*/
void vp8_build_inter16x16_predictors_mby(MACROBLOCKD *x) void vp8_build_inter16x16_predictors_mby(MACROBLOCKD *x)
{ {
...@@ -302,8 +353,23 @@ void vp8_build_inter16x16_predictors_mb(MACROBLOCKD *x, ...@@ -302,8 +353,23 @@ void vp8_build_inter16x16_predictors_mb(MACROBLOCKD *x,
RECON_INVOKE(&x->rtcd->recon, copy16x16)(ptr, pre_stride, dst_y, dst_ystride); RECON_INVOKE(&x->rtcd->recon, copy16x16)(ptr, pre_stride, dst_y, dst_ystride);
} }
mv_row = x->block[16].bmi.mv.as_mv.row; /* calc uv motion vectors */
mv_col = x->block[16].bmi.mv.as_mv.col; if (mv_row < 0)
mv_row -= 1;
else
mv_row += 1;
if (mv_col < 0)
mv_col -= 1;
else
mv_col += 1;
mv_row /= 2;
mv_col /= 2;
mv_row &= x->fullpixel_mask;
mv_col &= x->fullpixel_mask;
pre_stride >>= 1; pre_stride >>= 1;
offset = (mv_row >> 3) * pre_stride + (mv_col >> 3); offset = (mv_row >> 3) * pre_stride + (mv_col >> 3);
uptr = x->pre.u_buffer + offset; uptr = x->pre.u_buffer + offset;
...@@ -322,17 +388,21 @@ void vp8_build_inter16x16_predictors_mb(MACROBLOCKD *x, ...@@ -322,17 +388,21 @@ void vp8_build_inter16x16_predictors_mb(MACROBLOCKD *x,
} }
void vp8_build_inter4x4_predictors_mb(MACROBLOCKD *x) static void build_inter4x4_predictors_mb(MACROBLOCKD *x)
{ {
int i; int i;
if (x->mode_info_context->mbmi.partitioning < 3) if (x->mode_info_context->mbmi.partitioning < 3)
{ {
for (i = 0; i < 4; i++) x->block[ 0].bmi = x->mode_info_context->bmi[ 0];
{ x->block[ 2].bmi = x->mode_info_context->bmi[ 2];
BLOCKD *d = &x->block[bbb[i]]; x->block[ 8].bmi = x->mode_info_context->bmi[ 8];
build_inter_predictors4b(x, d, 16); x->block[10].bmi = x->mode_info_context->bmi[10];
}
build_inter_predictors4b(x, &x->block[ 0], 16);
build_inter_predictors4b(x, &x->block[ 2], 16);
build_inter_predictors4b(x, &x->block[ 8], 16);
build_inter_predictors4b(x, &x->block[10], 16);
} }
else else
{ {
...@@ -341,6 +411,9 @@ void vp8_build_inter4x4_predictors_mb(MACROBLOCKD *x) ...@@ -341,6 +411,9 @@ void vp8_build_inter4x4_predictors_mb(MACROBLOCKD *x)
BLOCKD *d0 = &x->block[i]; BLOCKD *d0 = &x->block[i];
BLOCKD *d1 = &x->block[i+1]; BLOCKD *d1 = &x->block[i+1];
x->block[i+0].bmi = x->mode_info_context->bmi[i+0];
x->block[i+1].bmi = x->mode_info_context->bmi[i+1];
if (d0->bmi.mv.as_int == d1->bmi.mv.as_int) if (d0->bmi.mv.as_int == d1->bmi.mv.as_int)
build_inter_predictors2b(x, d0, 16); build_inter_predictors2b(x, d0, 16);
else else
...@@ -368,25 +441,11 @@ void vp8_build_inter4x4_predictors_mb(MACROBLOCKD *x) ...@@ -368,25 +441,11 @@ void vp8_build_inter4x4_predictors_mb(MACROBLOCKD *x)
} }
} }
void vp8_build_inter_predictors_mb(MACROBLOCKD *x) static
{ void build_4x4uvmvs(MACROBLOCKD *x)
if (x->mode_info_context->mbmi.mode != SPLITMV)
{
vp8_build_inter16x16_predictors_mb(x, x->predictor, &x->predictor[256],
&x->predictor[320], 16, 8);
}
else
{
vp8_build_inter4x4_predictors_mb(x);
}
}
void vp8_build_uvmvs(MACROBLOCKD *x, int fullpixel)
{ {
int i, j; int i, j;
if (x->mode_info_context->mbmi.mode == SPLITMV)
{
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
for (j = 0; j < 2; j++) for (j = 0; j < 2; j++)
...@@ -397,69 +456,45 @@ void vp8_build_uvmvs(MACROBLOCKD *x, int fullpixel) ...@@ -397,69 +456,45 @@ void vp8_build_uvmvs(MACROBLOCKD *x, int fullpixel)
int temp; int temp;
temp = x->block[yoffset ].bmi.mv.as_mv.row temp = x->mode_info_context->bmi[yoffset + 0].mv.as_mv.row
+ x->block[yoffset+1].bmi.mv.as_mv.row + x->mode_info_context->bmi[yoffset + 1].mv.as_mv.row
+ x->block[yoffset+4].bmi.mv.as_mv.row + x->mode_info_context->bmi[yoffset + 4].mv.as_mv.row
+ x->block[yoffset+5].bmi.mv.as_mv.row; + x->mode_info_context->bmi[yoffset + 5].mv.as_mv.row;
if (temp < 0) temp -= 4; if (temp < 0) temp -= 4;
else temp += 4; else temp += 4;
x->block[uoffset].bmi.mv.as_mv.row = temp / 8; x->block[uoffset].bmi.mv.as_mv.row = (temp / 8) & x->fullpixel_mask;
if (fullpixel) temp = x->mode_info_context->bmi[yoffset + 0].mv.as_mv.col
x->block[uoffset].bmi.mv.as_mv.row = (temp / 8) & 0xfffffff8; + x->mode_info_context->bmi[yoffset + 1].mv.as_mv.col
+ x->mode_info_context->bmi[yoffset + 4].mv.as_mv.col
temp = x->block[yoffset ].bmi.mv.as_mv.col + x->mode_info_context->bmi[yoffset + 5].mv.as_mv.col;
+ x->block[yoffset+1].bmi.mv.as_mv.col
+ x->block[yoffset+4].bmi.mv.as_mv.col
+ x->block[yoffset+5].bmi.mv.as_mv.col;
if (temp < 0) temp -= 4; if (temp < 0) temp -= 4;
else temp += 4; else temp += 4;
x->block[uoffset].bmi.mv.as_mv.col = temp / 8; x->block[uoffset].bmi.mv.as_mv.col = (temp / 8) & x->fullpixel_mask;
if (fullpixel) x->block[voffset].bmi.mv.as_mv.row =
x->block[uoffset].bmi.mv.as_mv.col = (temp / 8) & 0xfffffff8; x->block[uoffset].bmi.mv.as_mv.row ;
x->block[voffset].bmi.mv.as_mv.col =
x->block[voffset].bmi.mv.as_mv.row = x->block[uoffset].bmi.mv.as_mv.row ; x->block[uoffset].bmi.mv.as_mv.col ;
x->block[voffset].bmi.mv.as_mv.col = x->block[uoffset].bmi.mv.as_mv.col ;
}
} }
} }
else }
{
int mvrow = x->mode_info_context->mbmi.mv.as_mv.row;
int mvcol = x->mode_info_context->mbmi.mv.as_mv.col;
if (mvrow < 0)
mvrow -= 1;
else
mvrow += 1;
if (mvcol < 0)
mvcol -= 1;
else
mvcol += 1;
mvrow /= 2;
mvcol /= 2;
for (i = 0; i < 8; i++)
{
x->block[ 16 + i].bmi.mv.as_mv.row = mvrow;
x->block[ 16 + i].bmi.mv.as_mv.col = mvcol;
if (fullpixel) void vp8_build_inter_predictors_mb(MACROBLOCKD *x)
{
if (x->mode_info_context->mbmi.mode != SPLITMV)
{ {
x->block[ 16 + i].bmi.mv.as_mv.row = mvrow & 0xfffffff8; vp8_build_inter16x16_predictors_mb(x, x->predictor, &x->predictor[256],
x->block[ 16 + i].bmi.mv.as_mv.col = mvcol & 0xfffffff8; &x->predictor[320], 16, 8);
}
} }
else
{
build_4x4uvmvs(x);
build_inter4x4_predictors_mb(x);
} }
} }
...@@ -22,8 +22,9 @@ extern void vp8_build_inter16x16_predictors_mb(MACROBLOCKD *x, ...@@ -22,8 +22,9 @@ extern void vp8_build_inter16x16_predictors_mb(MACROBLOCKD *x,
extern void vp8_build_inter16x16_predictors_mby(MACROBLOCKD *x); extern void vp8_build_inter16x16_predictors_mby(MACROBLOCKD *x);
extern void vp8_build_uvmvs(MACROBLOCKD *x, int fullpixel);
extern void vp8_build_inter_predictors_b(BLOCKD *d, int pitch, vp8_subpix_fn_t sppf); extern void vp8_build_inter_predictors_b(BLOCKD *d, int pitch, vp8_subpix_fn_t sppf);
extern void vp8_build_inter_predictors_mbuv(MACROBLOCKD *x);
extern void vp8_build_inter16x16_predictors_mbuv(MACROBLOCKD *x);
extern void vp8_build_inter4x4_predictors_mbuv(MACROBLOCKD *x);
#endif #endif
...@@ -306,8 +306,10 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, ...@@ -306,8 +306,10 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{ {
BLOCKD *b = &xd->block[i]; BLOCKD *b = &xd->block[i];
int b_mode = xd->mode_info_context->bmi[i].as_mode;
RECON_INVOKE(RTCD_VTABLE(recon), intra4x4_predict) RECON_INVOKE(RTCD_VTABLE(recon), intra4x4_predict)
(b, b->bmi.as_mode, b->predictor); (b, b_mode, b->predictor);
if (xd->eobs[i] > 1) if (xd->eobs[i] > 1)
{ {
...@@ -509,8 +511,6 @@ decode_mb_row(VP8D_COMP *pbi, VP8_COMMON *pc, int mb_row, MACROBLOCKD *xd) ...@@ -509,8 +511,6 @@ decode_mb_row(VP8D_COMP *pbi, VP8_COMMON *pc, int mb_row, MACROBLOCKD *xd)
} }
#endif #endif
update_blockd_bmi(xd);
xd->dst.y_buffer = pc->yv12_fb[dst_fb_idx].y_buffer + recon_yoffset; xd->dst.y_buffer = pc->yv12_fb[dst_fb_idx].y_buffer + recon_yoffset;
xd->dst.u_buffer = pc->yv12_fb[dst_fb_idx].u_buffer + recon_uvoffset; xd->dst.u_buffer = pc->yv12_fb[dst_fb_idx].u_buffer + recon_uvoffset;
xd->dst.v_buffer = pc->yv12_fb[dst_fb_idx].v_buffer + recon_uvoffset; xd->dst.v_buffer = pc->yv12_fb[dst_fb_idx].v_buffer + recon_uvoffset;
...@@ -535,17 +535,9 @@ decode_mb_row(VP8D_COMP *pbi, VP8_COMMON *pc, int mb_row, MACROBLOCKD *xd) ...@@ -535,17 +535,9 @@ decode_mb_row(VP8D_COMP *pbi, VP8_COMMON *pc, int mb_row, MACROBLOCKD *xd)
xd->corrupted |= pc->yv12_fb[ref_fb_idx].corrupted; xd->corrupted |= pc->yv12_fb[ref_fb_idx].corrupted;
} }
vp8_build_uvmvs(xd, pc->full_pixel);
#ifdef DEC_DEBUG #ifdef DEC_DEBUG
dec_debug = (pc->current_video_frame==5 && mb_row==2 && mb_col==3); dec_debug = (pc->current_video_frame==5 && mb_row==2 && mb_col==3);
#endif #endif
/*
if(pc->current_video_frame==0 &&mb_col==1 && mb_row==0)
pbi->debugoutput =1;
else
pbi->debugoutput =0;
*/
decode_macroblock(pbi, xd, mb_row * pc->mb_cols + mb_col); decode_macroblock(pbi, xd, mb_row * pc->mb_cols + mb_col);
/* check if the boolean decoder has suffered an error */ /* check if the boolean decoder has suffered an error */
...@@ -793,6 +785,11 @@ static void init_frame(VP8D_COMP *pbi) ...@@ -793,6 +785,11 @@ static void init_frame(VP8D_COMP *pbi)
xd->mode_info_context->mbmi.mode = DC_PRED; xd->mode_info_context->mbmi.mode = DC_PRED;
xd->mode_info_stride = pc->mode_info_stride; xd->mode_info_stride = pc->mode_info_stride;
xd->corrupted = 0; /* init without corruption */ xd->corrupted = 0; /* init without corruption */
xd->fullpixel_mask = 0xffffffff;
if(pc->full_pixel)
xd->fullpixel_mask = 0xfffffff8;
} }
int vp8_decode_frame(VP8D_COMP *pbi) int vp8_decode_frame(VP8D_COMP *pbi)
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
extern void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd); extern void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd);
extern void clamp_mvs(MACROBLOCKD *xd); extern void clamp_mvs(MACROBLOCKD *xd);
extern void vp8_build_uvmvs(MACROBLOCKD *x, int fullpixel);
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
#define RTCD_VTABLE(x) (&(pbi)->common.rtcd.x) #define RTCD_VTABLE(x) (&(pbi)->common.rtcd.x)
...@@ -91,6 +90,11 @@ static void setup_decoding_thread_data(VP8D_COMP *pbi, MACROBLOCKD *xd, MB_ROW_D ...@@ -91,6 +90,11 @@ static void setup_decoding_thread_data(VP8D_COMP *pbi, MACROBLOCKD *xd, MB_ROW_D
{ {
mbd->block[j].dequant = xd->block[j].dequant; mbd->block[j].dequant = xd->block[j].dequant;
} }
mbd->fullpixel_mask = 0xffffffff;
if(pc->full_pixel)
mbd->fullpixel_mask = 0xfffffff8;
} }
for (i=0; i< pc->mb_rows; i++) for (i=0; i< pc->mb_rows; i++)
...@@ -220,8 +224,9 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int m ...@@ -220,8 +224,9 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int m
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{ {
BLOCKD *b = &xd->block[i]; BLOCKD *b = &xd->block[i];
int b_mode = xd->mode_info_context->bmi[i].as_mode;
vp8mt_predict_intra4x4(pbi, xd, b->bmi.as_mode, b->predictor, mb_row, mb_col, i); vp8mt_predict_intra4x4(pbi, xd, b_mode, b->predictor, mb_row, mb_col, i);
if (xd->eobs[i] > 1) if (xd->eobs[i] > 1)
{ {
...@@ -321,8 +326,6 @@ static THREAD_FUNCTION thread_decoding_proc(void *p_data) ...@@ -321,8 +326,6 @@ static THREAD_FUNCTION thread_decoding_proc(void *p_data)
} }
} }
update_blockd_bmi(xd);
/* Distance of MB to the various image edges. /* Distance of MB to the various image edges.
* These are specified to 8th pel as they are always * These are specified to 8th pel as they are always
* compared to values that are in 1/8th pel units. * compared to values that are in 1/8th pel units.
...@@ -386,7 +389,6 @@ static THREAD_FUNCTION thread_decoding_proc(void *p_data) ...@@ -386,7 +389,6 @@ static THREAD_FUNCTION thread_decoding_proc(void *p_data)
xd->corrupted |= pc->yv12_fb[ref_fb_idx].corrupted; xd->corrupted |= pc->yv12_fb[ref_fb_idx].corrupted;
} }
vp8_build_uvmvs(xd, pc->full_pixel);
decode_macroblock(pbi, xd, mb_row, mb_col); decode_macroblock(pbi, xd, mb_row, mb_col);
/* check if the boolean decoder has suffered an error */ /* check if the boolean decoder has suffered an error */
...@@ -827,8 +829,6 @@ void vp8mt_decode_mb_rows( VP8D_COMP *pbi, MACROBLOCKD *xd) ...@@ -827,8 +829,6 @@ void vp8mt_decode_mb_rows( VP8D_COMP *pbi, MACROBLOCKD *xd)
} }
} }
update_blockd_bmi(xd);