diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-02-15 00:05:18 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-02-15 00:05:29 -0500 |
| commit | cf8aa08348109195c7adf7f7db5e1f171c0563f7 (patch) | |
| tree | d8ae9e52fe2838d2ebdf813f2506e071d548eba9 /vp8/encoder/encodeintra.c | |
| parent | 70dc0ed003cc7559c0058529a0ca1bef9775d208 (diff) | |
| parent | 7725a7eb56e74ebbdba14d01cfe85a151f81bf1c (diff) | |
| download | libvpx-cf8aa08348109195c7adf7f7db5e1f171c0563f7.tar libvpx-cf8aa08348109195c7adf7f7db5e1f171c0563f7.tar.gz libvpx-cf8aa08348109195c7adf7f7db5e1f171c0563f7.tar.bz2 libvpx-cf8aa08348109195c7adf7f7db5e1f171c0563f7.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I4b1a7a2ad0d62bdcabfed66c9dfdbe9b6bfa8b5e
Diffstat (limited to 'vp8/encoder/encodeintra.c')
| -rw-r--r-- | vp8/encoder/encodeintra.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c index 9163b427d..e016fa35b 100644 --- a/vp8/encoder/encodeintra.c +++ b/vp8/encoder/encodeintra.c @@ -58,21 +58,6 @@ void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x, BLOCK RECON_INVOKE(&rtcd->common->recon, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); } -void vp8_encode_intra4x4block_rd(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x, BLOCK *be, BLOCKD *b, int best_mode) -{ - vp8_predict_intra4x4(b, best_mode, b->predictor); - - ENCODEMB_INVOKE(&rtcd->encodemb, subb)(be, b, 16); - - x->vp8_short_fdct4x4(be->src_diff, be->coeff, 32); - - x->quantize_b(be, b); - - IDCT_INVOKE(&rtcd->common->idct, idct16)(b->dqcoeff, b->diff, 32); - - RECON_INVOKE(&rtcd->common->recon, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); -} - void vp8_encode_intra4x4mby(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *mb) { int i; @@ -168,17 +153,3 @@ void vp8_encode_intra16x16mbuv(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x) vp8_recon_intra_mbuv(IF_RTCD(&rtcd->common->recon), &x->e_mbd); } -void vp8_encode_intra16x16mbuvrd(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x) -{ - vp8_build_intra_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_mbuv(x); - - vp8_quantize_mbuv(x); - - vp8_inverse_transform_mbuv(IF_RTCD(&rtcd->common->idct), &x->e_mbd); - - vp8_recon_intra_mbuv(IF_RTCD(&rtcd->common->recon), &x->e_mbd); -} |