diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:09:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:09:35 +0100 |
| commit | c4e394e46008c9e208f666d156f49f7ba500d73a (patch) | |
| tree | 4c70acf89ede1f9d24ec3056bb2d586f98a12bcd /libavcodec/cavs.c | |
| parent | b5884db437eebe136efef63a8186b7b4b51b5525 (diff) | |
| parent | 79dad2a932534d1155079f937649e099f9e5cc27 (diff) | |
| download | ffmpeg-c4e394e46008c9e208f666d156f49f7ba500d73a.tar.gz | |
Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'
* commit '79dad2a932534d1155079f937649e099f9e5cc27':
dsputil: Separate h264chroma
Conflicts:
libavcodec/dsputil_template.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/vc1dec.c
libavcodec/vc1dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavs.c')
| -rw-r--r-- | libavcodec/cavs.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index bcdeb7c228..adf0ecaa56 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -28,6 +28,7 @@ #include "avcodec.h" #include "get_bits.h" #include "golomb.h" +#include "h264chroma.h" #include "mathops.h" #include "cavs.h" @@ -464,30 +465,35 @@ void ff_cavs_inter(AVSContext *h, enum cavs_mb mb_type) { if(ff_cavs_partition_flags[mb_type] == 0){ // 16x16 mc_part_std(h, 8, 0, h->cy, h->cu, h->cv, 0, 0, h->cdsp.put_cavs_qpel_pixels_tab[0], - h->dsp.put_h264_chroma_pixels_tab[0], + h->h264chroma.put_h264_chroma_pixels_tab[0], h->cdsp.avg_cavs_qpel_pixels_tab[0], - h->dsp.avg_h264_chroma_pixels_tab[0],&h->mv[MV_FWD_X0]); + h->h264chroma.avg_h264_chroma_pixels_tab[0], + &h->mv[MV_FWD_X0]); }else{ mc_part_std(h, 4, 0, h->cy, h->cu, h->cv, 0, 0, h->cdsp.put_cavs_qpel_pixels_tab[1], - h->dsp.put_h264_chroma_pixels_tab[1], + h->h264chroma.put_h264_chroma_pixels_tab[1], h->cdsp.avg_cavs_qpel_pixels_tab[1], - h->dsp.avg_h264_chroma_pixels_tab[1],&h->mv[MV_FWD_X0]); + h->h264chroma.avg_h264_chroma_pixels_tab[1], + &h->mv[MV_FWD_X0]); mc_part_std(h, 4, 0, h->cy, h->cu, h->cv, 4, 0, h->cdsp.put_cavs_qpel_pixels_tab[1], - h->dsp.put_h264_chroma_pixels_tab[1], + h->h264chroma.put_h264_chroma_pixels_tab[1], h->cdsp.avg_cavs_qpel_pixels_tab[1], - h->dsp.avg_h264_chroma_pixels_tab[1],&h->mv[MV_FWD_X1]); + h->h264chroma.avg_h264_chroma_pixels_tab[1], + &h->mv[MV_FWD_X1]); mc_part_std(h, 4, 0, h->cy, h->cu, h->cv, 0, 4, h->cdsp.put_cavs_qpel_pixels_tab[1], - h->dsp.put_h264_chroma_pixels_tab[1], + h->h264chroma.put_h264_chroma_pixels_tab[1], h->cdsp.avg_cavs_qpel_pixels_tab[1], - h->dsp.avg_h264_chroma_pixels_tab[1],&h->mv[MV_FWD_X2]); + h->h264chroma.avg_h264_chroma_pixels_tab[1], + &h->mv[MV_FWD_X2]); mc_part_std(h, 4, 0, h->cy, h->cu, h->cv, 4, 4, h->cdsp.put_cavs_qpel_pixels_tab[1], - h->dsp.put_h264_chroma_pixels_tab[1], + h->h264chroma.put_h264_chroma_pixels_tab[1], h->cdsp.avg_cavs_qpel_pixels_tab[1], - h->dsp.avg_h264_chroma_pixels_tab[1],&h->mv[MV_FWD_X3]); + h->h264chroma.avg_h264_chroma_pixels_tab[1], + &h->mv[MV_FWD_X3]); } } @@ -722,6 +728,7 @@ av_cold int ff_cavs_init(AVCodecContext *avctx) { AVSContext *h = avctx->priv_data; ff_dsputil_init(&h->dsp, avctx); + ff_h264chroma_init(&h->h264chroma, 8); ff_videodsp_init(&h->vdsp, 8); ff_cavsdsp_init(&h->cdsp, avctx); ff_init_scantable_permutation(h->dsp.idct_permutation, |