RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/mvcdec: simplify, no need to use reget buffer 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-05-21 18:06:14 +02:00
parent 566be4f9e8
commit 5ce1d089f0
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavcodec/mvcdec.c
View File

@ -31,7 +31,6 @@
#include "internal.h"
typedef struct MvcContext {
AVFrame *frame;
int vflip;
} MvcContext;
@ -53,10 +52,6 @@ static av_cold int mvc_decode_init(AVCodecContext *avctx)
avctx->pix_fmt = (avctx->codec_id == AV_CODEC_ID_MVC1) ? AV_PIX_FMT_RGB555
: AV_PIX_FMT_RGB32;
s->frame = av_frame_alloc();
if (!s->frame)
return AVERROR(ENOMEM);
s->vflip = avctx->extradata_size >= 9 &&
!memcmp(avctx->extradata + avctx->extradata_size - 9, "BottomUp", 9);
return 0;
@ -231,39 +226,32 @@ static int mvc_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
AVPacket *avpkt)
{
MvcContext *s = avctx->priv_data;
AVFrame *frame = data;
GetByteContext gb;
int ret;
if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
bytestream2_init(&gb, avpkt->data, avpkt->size);
if (avctx->codec_id == AV_CODEC_ID_MVC1)
ret = decode_mvc1(avctx, &gb, s->frame->data[0],
avctx->width, avctx->height, s->frame->linesize[0]);
ret = decode_mvc1(avctx, &gb, frame->data[0],
avctx->width, avctx->height, frame->linesize[0]);
else
ret = decode_mvc2(avctx, &gb, s->frame->data[0],
avctx->width, avctx->height, s->frame->linesize[0],
ret = decode_mvc2(avctx, &gb, frame->data[0],
avctx->width, avctx->height, frame->linesize[0],
s->vflip);
if (ret < 0)
return ret;
frame->pict_type = AV_PICTURE_TYPE_I;
frame->key_frame = 1;
*got_frame = 1;
if ((ret = av_frame_ref(data, s->frame)) < 0)
return ret;
return avpkt->size;
}
static av_cold int mvc_decode_end(AVCodecContext *avctx)
{
MvcContext *s = avctx->priv_data;
av_frame_free(&s->frame);
return 0;
}
#if CONFIG_MVC1_DECODER
AVCodec ff_mvc1_decoder = {
.name = "mvc1",
@ -272,7 +260,6 @@ AVCodec ff_mvc1_decoder = {
.id = AV_CODEC_ID_MVC1,
.priv_data_size = sizeof(MvcContext),
.init = mvc_decode_init,
.close = mvc_decode_end,
.decode = mvc_decode_frame,
.capabilities = AV_CODEC_CAP_DR1,
};
@ -286,7 +273,6 @@ AVCodec ff_mvc2_decoder = {
.id = AV_CODEC_ID_MVC2,
.priv_data_size = sizeof(MvcContext),
.init = mvc_decode_init,
.close = mvc_decode_end,
.decode = mvc_decode_frame,
.capabilities = AV_CODEC_CAP_DR1,
};