diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-03-10 13:55:07 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 03:58:00 +0100 |
| commit | 4ba5dbc0e4dc8737c71af77b6a5a905d6de2b76b (patch) | |
| tree | 9022230c0b60013c132020a1c260ab63f1924ea0 /libavcodec/mpegvideo.c | |
| parent | 46523897774cc0a748dab3be66df9b4cacc7233f (diff) | |
| download | ffmpeg-4ba5dbc0e4dc8737c71af77b6a5a905d6de2b76b.tar.gz | |
mpegvideo: use hpeldsp instead of dsputil for half-pel functions.
This also converts vc1, since that is mpegvideo-based.
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 2b8be33985..b276a0b48d 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -194,6 +194,7 @@ av_cold int ff_dct_common_init(MpegEncContext *s) { ff_dsputil_init(&s->dsp, s->avctx); ff_h264chroma_init(&s->h264chroma, 8); //for lowres + ff_hpeldsp_init(&s->hdsp, s->avctx->flags); ff_videodsp_init(&s->vdsp, s->avctx->bits_per_raw_sample); s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_c; @@ -2793,13 +2794,13 @@ void MPV_decode_mb_internal(MpegEncContext *s, int16_t block[12][64], }else{ op_qpix= s->me.qpel_put; if ((!s->no_rounding) || s->pict_type==AV_PICTURE_TYPE_B){ - op_pix = s->dsp.put_pixels_tab; + op_pix = s->hdsp.put_pixels_tab; }else{ - op_pix = s->dsp.put_no_rnd_pixels_tab; + op_pix = s->hdsp.put_no_rnd_pixels_tab; } if (s->mv_dir & MV_DIR_FORWARD) { ff_MPV_motion(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.f.data, op_pix, op_qpix); - op_pix = s->dsp.avg_pixels_tab; + op_pix = s->hdsp.avg_pixels_tab; op_qpix= s->me.qpel_avg; } if (s->mv_dir & MV_DIR_BACKWARD) { @@ -2920,9 +2921,9 @@ void MPV_decode_mb_internal(MpegEncContext *s, int16_t block[12][64], } skip_idct: if(!readable){ - s->dsp.put_pixels_tab[0][0](s->dest[0], dest_y , linesize,16); - s->dsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[1], dest_cb, uvlinesize,16 >> s->chroma_y_shift); - s->dsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[2], dest_cr, uvlinesize,16 >> s->chroma_y_shift); + s->hdsp.put_pixels_tab[0][0](s->dest[0], dest_y , linesize,16); + s->hdsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[1], dest_cb, uvlinesize,16 >> s->chroma_y_shift); + s->hdsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[2], dest_cr, uvlinesize,16 >> s->chroma_y_shift); } } } |