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

kgv1dec: replace forcing EMU_EDGE by a copy

Browse Source 
The decoder currently sets CODEC_FLAG_EMU_EDGE and relies on
get_buffer2() to always provide buffers with linesize == 2 * width.
This is wrong, since we place no such restriction on get_buffer2()
implementations.

Fix this by decoding into internal buffers and copying them to output
frames. Since this is a very obscure decoder, the performance hit should
not be an issue.
This commit is contained in:
Anton Khirnov 2013-12-17 08:56:13 +01:00
parent fe80fa53bc
commit adb199d1bc
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libavcodec/kgv1dec.c
View File

@ -32,14 +32,16 @@
typedef struct { typedef struct {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame *prev; uint16_t *frame_buffer;
uint16_t *last_frame_buffer;
} KgvContext; } KgvContext;
static void decode_flush(AVCodecContext *avctx) static void decode_flush(AVCodecContext *avctx)
{ {
KgvContext * const c = avctx->priv_data; KgvContext * const c = avctx->priv_data;
av_frame_free(&c->prev); av_freep(&c->frame_buffer);
av_freep(&c->last_frame_buffer);
} }
static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
@ -62,21 +64,27 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
buf += 2; buf += 2;
if (w != avctx->width || h != avctx->height) { if (w != avctx->width || h != avctx->height) {
av_frame_unref(c->prev); av_freep(&c->frame_buffer);
av_freep(&c->last_frame_buffer);
if ((res = ff_set_dimensions(avctx, w, h)) < 0) if ((res = ff_set_dimensions(avctx, w, h)) < 0)
return res; return res;
} }
if (!c->frame_buffer) {
c->frame_buffer = av_mallocz(avctx->width * avctx->height * 2);
c->last_frame_buffer = av_mallocz(avctx->width * avctx->height * 2);
if (!c->frame_buffer || !c->last_frame_buffer) {
decode_flush(avctx);
return AVERROR(ENOMEM);
}
}
maxcnt = w * h; maxcnt = w * h;
if ((res = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) if ((res = ff_get_buffer(avctx, frame, 0)) < 0)
return res; return res;
out = (uint16_t *) frame->data[0]; out = c->frame_buffer;
if (c->prev->data[0]) { prev = c->last_frame_buffer;
prev = (uint16_t *) c->prev->data[0];
} else {
prev = NULL;
}
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
offsets[i] = -1; offsets[i] = -1;
@ -152,9 +160,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (outcnt - maxcnt) if (outcnt - maxcnt)
av_log(avctx, AV_LOG_DEBUG, "frame finished with %d diff\n", outcnt - maxcnt); av_log(avctx, AV_LOG_DEBUG, "frame finished with %d diff\n", outcnt - maxcnt);
av_frame_unref(c->prev); av_image_copy_plane(frame->data[0], frame->linesize[0],
if ((res = av_frame_ref(c->prev, frame)) < 0) (const uint8_t*)c->frame_buffer, avctx->width * 2,
return res; avctx->width * 2, avctx->height);
FFSWAP(uint16_t *, c->frame_buffer, c->last_frame_buffer);
*got_frame = 1; *got_frame = 1;
@ -165,13 +174,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
{ {
KgvContext * const c = avctx->priv_data; KgvContext * const c = avctx->priv_data;
c->prev = av_frame_alloc();
if (!c->prev)
return AVERROR(ENOMEM);
c->avctx = avctx; c->avctx = avctx;
avctx->pix_fmt = AV_PIX_FMT_RGB555; avctx->pix_fmt = AV_PIX_FMT_RGB555;
avctx->flags |= CODEC_FLAG_EMU_EDGE;
return 0; return 0;
} }