diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c index a8595af2d26a5c692468b9347b2f573375661e42..556940f0e621be61861ae9581c5b99babd91123d 100644 --- a/vp8/encoder/encodeintra.c +++ b/vp8/encoder/encodeintra.c @@ -155,7 +155,7 @@ void vp8_encode_intra16x16mbyrd(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x) ENCODEMB_INVOKE(&rtcd->encodemb, submby)(x->src_diff, x->src.y_buffer, x->e_mbd.predictor, x->src.y_stride); - vp8_transform_intra_mbyrd(x); + vp8_transform_intra_mby(x); x->e_mbd.mbmi.mb_skip_coeff = 1; @@ -223,7 +223,7 @@ void vp8_encode_intra16x16mbuvrd(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x) ENCODEMB_INVOKE(&rtcd->encodemb, submbuv)(x->src_diff, x->src.u_buffer, x->src.v_buffer, x->e_mbd.predictor, x->src.uv_stride); - vp8_transform_mbuvrd(x); + vp8_transform_mbuv(x); vp8_quantize_mbuv(x); diff --git a/vp8/encoder/encodemb.c b/vp8/encoder/encodemb.c index 06aeb6f7f1827722ec50b8fd73558684192b54c2..485001e519abd84617505a00b3479e1731716aef 100644 --- a/vp8/encoder/encodemb.c +++ b/vp8/encoder/encodemb.c @@ -121,21 +121,12 @@ void vp8_transform_mbuv(MACROBLOCK *x) for (i = 16; i < 24; i += 2) { - x->vp8_short_fdct8x4(&x->block[i].src_diff[0], &x->block[i].coeff[0], 16); - } -} - -void vp8_transform_mbuvrd(MACROBLOCK *x) -{ - int i; - - for (i = 16; i < 24; i += 2) - { - x->vp8_short_fdct8x4(&x->block[i].src_diff[0], + x->vp8_short_fdct8x4(&x->block[i].src_diff[0], &x->block[i].coeff[0], 16); } } + void vp8_transform_intra_mby(MACROBLOCK *x) { int i; @@ -155,23 +146,6 @@ void vp8_transform_intra_mby(MACROBLOCK *x) } -void vp8_transform_intra_mbyrd(MACROBLOCK *x) -{ - int i; - - for (i = 0; i < 16; i += 2) - { - x->vp8_short_fdct8x4(&x->block[i].src_diff[0], - &x->block[i].coeff[0], 32); - } - - // build dc block from 16 y dc values - vp8_build_dcblock(x); - - // do 2nd order transform on the dc block - x->short_walsh4x4(&x->block[24].src_diff[0], - &x->block[24].coeff[0], 8); -} void vp8_transform_mb(MACROBLOCK *x) { @@ -219,31 +193,6 @@ void vp8_transform_mby(MACROBLOCK *x) } } -void vp8_transform_mbrd(MACROBLOCK *x) -{ - int i; - - for (i = 0; i < 16; i += 2) - { - x->vp8_short_fdct8x4(&x->block[i].src_diff[0], - &x->block[i].coeff[0], 32); - } - - // build dc block from 16 y dc values - if (x->e_mbd.mbmi.mode != SPLITMV) - vp8_build_dcblock(x); - - for (i = 16; i < 24; i += 2) - { - x->vp8_short_fdct8x4(&x->block[i].src_diff[0], - &x->block[i].coeff[0], 16); - } - - // do 2nd order transform on the dc block - if (x->e_mbd.mbmi.mode != SPLITMV) - x->short_walsh4x4(&x->block[24].src_diff[0], - &x->block[24].coeff[0], 8); -} void vp8_stuff_inter16x16(MACROBLOCK *x) { @@ -744,7 +693,7 @@ void vp8_encode_inter16x16uvrd(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x) vp8_build_inter_predictors_mbuv(&x->e_mbd); ENCODEMB_INVOKE(&rtcd->encodemb, submbuv)(x->src_diff, x->src.u_buffer, x->src.v_buffer, x->e_mbd.predictor, x->src.uv_stride); - vp8_transform_mbuvrd(x); + vp8_transform_mbuv(x); vp8_quantize_mbuv(x); diff --git a/vp8/encoder/encodemb.h b/vp8/encoder/encodemb.h index 4239352488c7272e6379bd3b8ab5ca5fb297165f..f7b110d6449f3f7b62d42c7687d994d68dde7454 100644 --- a/vp8/encoder/encodemb.h +++ b/vp8/encoder/encodemb.h @@ -100,9 +100,7 @@ extern void vp8_stuff_inter16x16(MACROBLOCK *x); void vp8_build_dcblock(MACROBLOCK *b); void vp8_transform_mb(MACROBLOCK *mb); void vp8_transform_mbuv(MACROBLOCK *x); -void vp8_transform_mbuvrd(MACROBLOCK *x); void vp8_transform_intra_mby(MACROBLOCK *x); -void vp8_transform_intra_mbyrd(MACROBLOCK *x); void Encode16x16Y(MACROBLOCK *x); void Encode16x16UV(MACROBLOCK *x); void vp8_encode_inter16x16uv(const struct VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x);