Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

bink: Use hpeldsp instead of dsputil for half-pel functions

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
pull/15/head
Ronald S. Bultje 12 years ago committed by Martin Storsjö
parent 8f992dc8c7
commit 0f0a11d576
2 changed files with 11 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      configure
  2. 17
      libavcodec/bink.c

2
configure vendored
Unescape View File

@ -1533,7 +1533,7 @@ asv2_decoder_select="dsputil"
asv2_encoder_select="dsputil" asv2_encoder_select="dsputil"
atrac1_decoder_select="mdct sinewin" atrac1_decoder_select="mdct sinewin"
atrac3_decoder_select="mdct" atrac3_decoder_select="mdct"
bink_decoder_select="dsputil" bink_decoder_select="dsputil hpeldsp"
binkaudio_dct_decoder_select="mdct rdft dct sinewin" binkaudio_dct_decoder_select="mdct rdft dct sinewin"
binkaudio_rdft_decoder_select="mdct rdft sinewin" binkaudio_rdft_decoder_select="mdct rdft sinewin"
cavs_decoder_select="dsputil golomb h264chroma videodsp" cavs_decoder_select="dsputil golomb h264chroma videodsp"

17
libavcodec/bink.c
Unescape View File

@ -26,6 +26,7 @@
#include "dsputil.h" #include "dsputil.h"
#include "binkdata.h" #include "binkdata.h"
#include "binkdsp.h" #include "binkdsp.h"
#include "hpeldsp.h"
#include "internal.h" #include "internal.h"
#include "mathops.h" #include "mathops.h"
@ -112,6 +113,7 @@ typedef struct Bundle {
typedef struct BinkContext { typedef struct BinkContext {
AVCodecContext *avctx; AVCodecContext *avctx;
DSPContext dsp; DSPContext dsp;
HpelDSPContext hdsp;
BinkDSPContext bdsp; BinkDSPContext bdsp;
AVFrame *last; AVFrame *last;
int version; ///< internal Bink file version int version; ///< internal Bink file version
@ -870,7 +872,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb,
if (ref < ref_start || ref + 8*stride > ref_end) { if (ref < ref_start || ref + 8*stride > ref_end) {
av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n"); av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n");
} else if (ref + 8*stride < dst || ref >= dst + 8*stride) { } 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 { } else {
put_pixels8x8_overlapped(dst, ref, stride); put_pixels8x8_overlapped(dst, ref, stride);
} }
@ -886,7 +888,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb,
if (ref < ref_start || ref + 8 * stride > ref_end) { if (ref < ref_start || ref + 8 * stride > ref_end) {
av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n"); av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n");
} else if (ref + 8*stride < dst || ref >= dst + 8*stride) { } 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 { } else {
put_pixels8x8_overlapped(dst, ref, stride); put_pixels8x8_overlapped(dst, ref, stride);
} }
@ -916,7 +918,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb,
if (ref < ref_start || ref + 8 * stride > ref_end) { if (ref < ref_start || ref + 8 * stride > ref_end) {
av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n"); av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n");
} else if (ref + 8*stride < dst || ref >= dst + 8*stride) { } 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 { } else {
put_pixels8x8_overlapped(dst, ref, stride); put_pixels8x8_overlapped(dst, ref, stride);
} }
@ -1005,7 +1007,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb,
} }
switch (blk) { switch (blk) {
case SKIP_BLOCK: 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; break;
case SCALED_BLOCK: case SCALED_BLOCK:
blk = get_value(c, BINK_SRC_SUB_BLOCK_TYPES); blk = get_value(c, BINK_SRC_SUB_BLOCK_TYPES);
@ -1076,7 +1078,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb,
bx*8 + xoff, by*8 + yoff); bx*8 + xoff, by*8 + yoff);
return AVERROR_INVALIDDATA; 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; break;
case RUN_BLOCK: case RUN_BLOCK:
scan = bink_patterns[get_bits(gb, 4)]; scan = bink_patterns[get_bits(gb, 4)];
@ -1110,7 +1112,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb,
bx*8 + xoff, by*8 + yoff); bx*8 + xoff, by*8 + yoff);
return AVERROR_INVALIDDATA; 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); c->dsp.clear_block(block);
v = get_bits(gb, 7); v = get_bits(gb, 7);
read_residue(gb, block, v); read_residue(gb, block, v);
@ -1130,7 +1132,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb,
xoff = get_value(c, BINK_SRC_X_OFF); xoff = get_value(c, BINK_SRC_X_OFF);
yoff = get_value(c, BINK_SRC_Y_OFF); yoff = get_value(c, BINK_SRC_Y_OFF);
ref = prev + xoff + yoff * stride; ref = prev + xoff + yoff * stride;
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); memset(dctblock, 0, sizeof(*dctblock) * 64);
dctblock[0] = get_value(c, BINK_SRC_INTER_DC); dctblock[0] = get_value(c, BINK_SRC_INTER_DC);
read_dct_coeffs(gb, dctblock, bink_scan, bink_inter_quant, -1); 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; avctx->pix_fmt = c->has_alpha ? AV_PIX_FMT_YUVA420P : AV_PIX_FMT_YUV420P;
ff_dsputil_init(&c->dsp, avctx); ff_dsputil_init(&c->dsp, avctx);
ff_hpeldsp_init(&c->hdsp, avctx->flags);
ff_binkdsp_init(&c->bdsp); ff_binkdsp_init(&c->bdsp);
init_bundles(c); init_bundles(c);

Write Preview
Loading…
Cancel
Save