diff options
Diffstat (limited to 'libavcodec/eamad.c')
-rw-r--r-- | libavcodec/eamad.c | 63 |
1 files changed, 29 insertions, 34 deletions
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index b9679bc..1e8d395 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -45,7 +45,6 @@ typedef struct MadContext { AVCodecContext *avctx; DSPContext dsp; - AVFrame frame; AVFrame last_frame; GetBitContext gb; void *bitstream_buf; @@ -78,15 +77,16 @@ static inline void comp(unsigned char *dst, int dst_stride, dst[j*dst_stride + i] = av_clip_uint8(src[j*src_stride + i] + add); } -static inline void comp_block(MadContext *t, int mb_x, int mb_y, +static inline void comp_block(MadContext *t, AVFrame *frame, + int mb_x, int mb_y, int j, int mv_x, int mv_y, int add) { if (j < 4) { unsigned offset = (mb_y*16 + ((j&2)<<2) + mv_y)*t->last_frame.linesize[0] + mb_x*16 + ((j&1)<<3) + mv_x; if (offset >= (t->avctx->height - 7) * t->last_frame.linesize[0] - 7) return; - comp(t->frame.data[0] + (mb_y*16 + ((j&2)<<2))*t->frame.linesize[0] + mb_x*16 + ((j&1)<<3), - t->frame.linesize[0], + comp(frame->data[0] + (mb_y*16 + ((j&2)<<2))*frame->linesize[0] + mb_x*16 + ((j&1)<<3), + frame->linesize[0], t->last_frame.data[0] + offset, t->last_frame.linesize[0], add); } else if (!(t->avctx->flags & CODEC_FLAG_GRAY)) { @@ -94,24 +94,25 @@ static inline void comp_block(MadContext *t, int mb_x, int mb_y, unsigned offset = (mb_y * 8 + (mv_y/2))*t->last_frame.linesize[index] + mb_x * 8 + (mv_x/2); if (offset >= (t->avctx->height/2 - 7) * t->last_frame.linesize[index] - 7) return; - comp(t->frame.data[index] + (mb_y*8)*t->frame.linesize[index] + mb_x * 8, - t->frame.linesize[index], + comp(frame->data[index] + (mb_y*8)*frame->linesize[index] + mb_x * 8, + frame->linesize[index], t->last_frame.data[index] + offset, t->last_frame.linesize[index], add); } } -static inline void idct_put(MadContext *t, int16_t *block, int mb_x, int mb_y, int j) +static inline void idct_put(MadContext *t, AVFrame *frame, int16_t *block, + int mb_x, int mb_y, int j) { if (j < 4) { ff_ea_idct_put_c( - t->frame.data[0] + (mb_y*16 + ((j&2)<<2))*t->frame.linesize[0] + mb_x*16 + ((j&1)<<3), - t->frame.linesize[0], block); + frame->data[0] + (mb_y*16 + ((j&2)<<2))*frame->linesize[0] + mb_x*16 + ((j&1)<<3), + frame->linesize[0], block); } else if (!(t->avctx->flags & CODEC_FLAG_GRAY)) { int index = j - 3; ff_ea_idct_put_c( - t->frame.data[index] + (mb_y*8)*t->frame.linesize[index] + mb_x*8, - t->frame.linesize[index], block); + frame->data[index] + (mb_y*8)*frame->linesize[index] + mb_x*8, + frame->linesize[index], block); } } @@ -186,7 +187,7 @@ static int decode_motion(GetBitContext *gb) return value; } -static int decode_mb(MadContext *s, int inter) +static int decode_mb(MadContext *s, AVFrame *frame, int inter) { int mv_map = 0; int mv_x, mv_y; @@ -205,12 +206,12 @@ static int decode_mb(MadContext *s, int inter) if (mv_map & (1<<j)) { // mv_x and mv_y are guarded by mv_map int add = 2*decode_motion(&s->gb); if (s->last_frame.data[0]) - comp_block(s, s->mb_x, s->mb_y, j, mv_x, mv_y, add); + comp_block(s, frame, s->mb_x, s->mb_y, j, mv_x, mv_y, add); } else { s->dsp.clear_block(s->block); if(decode_block_intra(s, s->block) < 0) return -1; - idct_put(s, s->block, s->mb_x, s->mb_y, j); + idct_put(s, frame, s->block, s->mb_x, s->mb_y, j); } } return 0; @@ -233,9 +234,10 @@ static int decode_frame(AVCodecContext *avctx, int buf_size = avpkt->size; const uint8_t *buf_end = buf+buf_size; MadContext *s = avctx->priv_data; - int width, height, ret; + AVFrame *frame = data; + int width, height; int chunk_type; - int inter; + int inter, ret; if (buf_size < 26) { av_log(avctx, AV_LOG_ERROR, "Input buffer too small\n"); @@ -261,18 +263,12 @@ static int decode_frame(AVCodecContext *avctx, if ((ret = av_image_check_size(width, height, 0, avctx)) < 0) return ret; avcodec_set_dimensions(avctx, width, height); - if (s->frame.data[0]) - avctx->release_buffer(avctx, &s->frame); - if (s->last_frame.data[0]) - avctx->release_buffer(avctx, &s->last_frame); + av_frame_unref(&s->last_frame); } - s->frame.reference = 3; - if (!s->frame.data[0]) { - if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return ret; - } + if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) { + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + return ret; } av_fast_padded_malloc(&s->bitstream_buf, &s->bitstream_buf_size, @@ -285,14 +281,16 @@ static int decode_frame(AVCodecContext *avctx, for (s->mb_y=0; s->mb_y < (avctx->height+15)/16; s->mb_y++) for (s->mb_x=0; s->mb_x < (avctx->width +15)/16; s->mb_x++) - if(decode_mb(s, inter) < 0) + if(decode_mb(s, frame, inter) < 0) return AVERROR_INVALIDDATA; *got_frame = 1; - *(AVFrame*)data = s->frame; - if (chunk_type != MADe_TAG) - FFSWAP(AVFrame, s->frame, s->last_frame); + if (chunk_type != MADe_TAG) { + av_frame_unref(&s->last_frame); + if ((ret = av_frame_ref(&s->last_frame, frame)) < 0) + return ret; + } return buf_size; } @@ -300,10 +298,7 @@ static int decode_frame(AVCodecContext *avctx, static av_cold int decode_end(AVCodecContext *avctx) { MadContext *t = avctx->priv_data; - if (t->frame.data[0]) - avctx->release_buffer(avctx, &t->frame); - if (t->last_frame.data[0]) - avctx->release_buffer(avctx, &t->last_frame); + av_frame_unref(&t->last_frame); av_free(t->bitstream_buf); return 0; } |