diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-03-10 09:12:01 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 03:56:09 +0100 |
| commit | af1e3dfb9eaf8c9ab0b6b34e330341ce8c45c652 (patch) | |
| tree | 60634123566bc180df6bda05ea2e93773b90d5ef /libavcodec/bink.c | |
| parent | 4b642ab19b5a4ddb404cd69f73f08ef7e0ed6bca (diff) | |
bink: use hpeldsp instead of dsputil for half-pel functions.
Diffstat (limited to 'libavcodec/bink.c')
| -rw-r--r-- | libavcodec/bink.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/libavcodec/bink.c b/libavcodec/bink.c index 5aeef2cf7b..980df453cd 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -26,6 +26,7 @@ #include "dsputil.h" #include "binkdata.h" #include "binkdsp.h" +#include "hpeldsp.h" #include "internal.h" #include "mathops.h" @@ -112,6 +113,7 @@ typedef struct Bundle { typedef struct BinkContext { AVCodecContext *avctx; DSPContext dsp; + HpelDSPContext hdsp; BinkDSPContext bdsp; AVFrame *last; int version; ///< internal Bink file version @@ -878,7 +880,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, if (ref < ref_start || ref + 8*stride > ref_end) { av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n"); } else if (ref + 8*stride < dst || ref >= dst + 8*stride) { - c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8); + c->hdsp.put_pixels_tab[1][0](dst, ref, stride, 8); } else { put_pixels8x8_overlapped(dst, ref, stride); } @@ -894,7 +896,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, if (ref < ref_start || ref + 8 * stride > ref_end) { av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n"); } else if (ref + 8*stride < dst || ref >= dst + 8*stride) { - c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8); + c->hdsp.put_pixels_tab[1][0](dst, ref, stride, 8); } else { put_pixels8x8_overlapped(dst, ref, stride); } @@ -924,7 +926,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, if (ref < ref_start || ref + 8 * stride > ref_end) { av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n"); } else if (ref + 8*stride < dst || ref >= dst + 8*stride) { - c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8); + c->hdsp.put_pixels_tab[1][0](dst, ref, stride, 8); } else { put_pixels8x8_overlapped(dst, ref, stride); } @@ -1013,7 +1015,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, } switch (blk) { case SKIP_BLOCK: - c->dsp.put_pixels_tab[1][0](dst, prev, stride, 8); + c->hdsp.put_pixels_tab[1][0](dst, prev, stride, 8); break; case SCALED_BLOCK: blk = get_value(c, BINK_SRC_SUB_BLOCK_TYPES); @@ -1084,7 +1086,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, bx*8 + xoff, by*8 + yoff); return AVERROR_INVALIDDATA; } - c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8); + c->hdsp.put_pixels_tab[1][0](dst, ref, stride, 8); break; case RUN_BLOCK: scan = bink_patterns[get_bits(gb, 4)]; @@ -1118,7 +1120,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, bx*8 + xoff, by*8 + yoff); return AVERROR_INVALIDDATA; } - c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8); + c->hdsp.put_pixels_tab[1][0](dst, ref, stride, 8); c->dsp.clear_block(block); v = get_bits(gb, 7); read_residue(gb, block, v); @@ -1143,7 +1145,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, bx*8 + xoff, by*8 + yoff); return -1; } - c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8); + c->hdsp.put_pixels_tab[1][0](dst, ref, stride, 8); memset(dctblock, 0, sizeof(*dctblock) * 64); dctblock[0] = get_value(c, BINK_SRC_INTER_DC); read_dct_coeffs(gb, dctblock, bink_scan, bink_inter_quant, -1); @@ -1305,6 +1307,7 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->pix_fmt = c->has_alpha ? AV_PIX_FMT_YUVA420P : AV_PIX_FMT_YUV420P; ff_dsputil_init(&c->dsp, avctx); + ff_hpeldsp_init(&c->hdsp, avctx->flags); ff_binkdsp_init(&c->bdsp); if ((ret = init_bundles(c)) < 0) { |