virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avcodec/wcmv: use ff_reget_buffer()

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2019-08-29 19:24:10 -03:00
parent 9ea6d2149e
commit c14a12ac84
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/wcmv.c
View File

@ -60,7 +60,7 @@ static int decode_frame(AVCodecContext *avctx,
if (!blocks) if (!blocks)
return avpkt->size; return avpkt->size;
if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) if ((ret = ff_reget_buffer(avctx, s->prev_frame, 0)) < 0)
return ret; return ret;
if (blocks > 5) { if (blocks > 5) {
@ -157,13 +157,9 @@ static int decode_frame(AVCodecContext *avctx,
if (bytestream2_get_bytes_left(&gb) < 8LL * blocks) if (bytestream2_get_bytes_left(&gb) < 8LL * blocks)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (s->prev_frame->data[0]) { if (!avctx->frame_number) {
ret = av_frame_copy(frame, s->prev_frame); ptrdiff_t linesize[4] = { s->prev_frame->linesize[0], 0, 0, 0 };
if (ret < 0) av_image_fill_black(s->prev_frame->data, linesize, avctx->pix_fmt, 0,
return ret;
} else {
ptrdiff_t linesize[4] = { frame->linesize[0], 0, 0, 0 };
av_image_fill_black(frame->data, linesize, avctx->pix_fmt, 0,
avctx->width, avctx->height); avctx->width, avctx->height);
} }
@ -184,7 +180,7 @@ static int decode_frame(AVCodecContext *avctx,
if (w > avctx->width || h > avctx->height) if (w > avctx->width || h > avctx->height)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
dst = frame->data[0] + (avctx->height - y - 1) * frame->linesize[0] + x * bpp; dst = s->prev_frame->data[0] + (avctx->height - y - 1) * s->prev_frame->linesize[0] + x * bpp;
for (int i = 0; i < h; i++) { for (int i = 0; i < h; i++) {
s->zstream.next_out = dst; s->zstream.next_out = dst;
s->zstream.avail_out = w * bpp; s->zstream.avail_out = w * bpp;
@ -196,15 +192,14 @@ static int decode_frame(AVCodecContext *avctx,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
dst -= frame->linesize[0]; dst -= s->prev_frame->linesize[0];
} }
} }
frame->key_frame = intra; s->prev_frame->key_frame = intra;
frame->pict_type = intra ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; s->prev_frame->pict_type = intra ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
av_frame_unref(s->prev_frame); if ((ret = av_frame_ref(frame, s->prev_frame)) < 0)
if ((ret = av_frame_ref(s->prev_frame, frame)) < 0)
return ret; return ret;
*got_frame = 1; *got_frame = 1;