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

zmbvenc: use the AVFrame API properly.

Browse Source
This commit is contained in:
Anton Khirnov 2013-11-09 10:14:46 +01:00
parent d100f9e7cd
commit a837c4f2df
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libavcodec/zmbvenc.c
View File

@ -44,7 +44,6 @@
*/ */
typedef struct ZmbvEncContext { typedef struct ZmbvEncContext {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame pic;
int range; int range;
uint8_t *comp_buf, *work_buf; uint8_t *comp_buf, *work_buf;
@ -121,7 +120,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *pict, int *got_packet) const AVFrame *pict, int *got_packet)
{ {
ZmbvEncContext * const c = avctx->priv_data; ZmbvEncContext * const c = avctx->priv_data;
AVFrame * const p = &c->pic; const AVFrame * const p = pict;
uint8_t *src, *prev, *buf; uint8_t *src, *prev, *buf;
uint32_t *palptr; uint32_t *palptr;
int keyframe, chpal; int keyframe, chpal;
@ -134,9 +133,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
c->curfrm++; c->curfrm++;
if(c->curfrm == c->keyint) if(c->curfrm == c->keyint)
c->curfrm = 0; c->curfrm = 0;
*p = *pict; avctx->coded_frame->pict_type = keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
p->pict_type= keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; avctx->coded_frame->key_frame = keyframe;
p->key_frame= keyframe;
chpal = !keyframe && memcmp(p->data[1], c->pal2, 1024); chpal = !keyframe && memcmp(p->data[1], c->pal2, 1024);
palptr = (uint32_t*)p->data[1]; palptr = (uint32_t*)p->data[1];
@ -253,6 +251,20 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
return 0; return 0;
} }
static av_cold int encode_end(AVCodecContext *avctx)
{
ZmbvEncContext * const c = avctx->priv_data;
av_freep(&c->comp_buf);
av_freep(&c->work_buf);
deflateEnd(&c->zstream);
av_freep(&c->prev);
av_frame_free(&avctx->coded_frame);
return 0;
}
/** /**
* Init zmbv encoder * Init zmbv encoder
@ -314,25 +326,11 @@ static av_cold int encode_init(AVCodecContext *avctx)
return -1; return -1;
} }
avctx->coded_frame = &c->pic; avctx->coded_frame = av_frame_alloc();
if (!avctx->coded_frame) {
return 0; encode_end(avctx);
} return AVERROR(ENOMEM);
}
/**
* Uninit zmbv encoder
*/
static av_cold int encode_end(AVCodecContext *avctx)
{
ZmbvEncContext * const c = avctx->priv_data;
av_freep(&c->comp_buf);
av_freep(&c->work_buf);
deflateEnd(&c->zstream);
av_freep(&c->prev);
return 0; return 0;
} }