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

Merge commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f' 

* commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f':
  kgv1dec: replace forcing EMU_EDGE by a copy

Conflicts:
	libavcodec/kgv1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-06 13:57:29 +01:00
parent d1134ababd adb199d1bc
commit 80d44190c4
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libavcodec/kgv1dec.c
View File

@ -31,14 +31,16 @@
#include "internal.h"
typedef struct {
AVFrame *prev;
uint16_t *frame_buffer;
uint16_t *last_frame_buffer;
} KgvContext;
static void decode_flush(AVCodecContext *avctx)
{
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,
@ -61,21 +63,27 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
buf += 2;
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)
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;
if ((res = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
if ((res = ff_get_buffer(avctx, frame, 0)) < 0)
return res;
out = frame->data[0];
if (c->prev->data[0]) {
prev = c->prev->data[0];
} else {
prev = NULL;
}
out = c->frame_buffer;
prev = c->last_frame_buffer;
for (i = 0; i < 8; i++)
offsets[i] = -1;
@ -142,9 +150,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (outcnt - maxcnt)
av_log(avctx, AV_LOG_DEBUG, "frame finished with %d diff\n", outcnt - maxcnt);
av_frame_unref(c->prev);
if ((res = av_frame_ref(c->prev, frame)) < 0)
return res;
av_image_copy_plane(frame->data[0], frame->linesize[0],
(const uint8_t*)c->frame_buffer, avctx->width * 2,
avctx->width * 2, avctx->height);
FFSWAP(uint16_t *, c->frame_buffer, c->last_frame_buffer);
*got_frame = 1;
@ -155,12 +164,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
{
KgvContext * const c = avctx->priv_data;
c->prev = av_frame_alloc();
if (!c->prev)
return AVERROR(ENOMEM);
avctx->pix_fmt = AV_PIX_FMT_RGB555;
avctx->flags |= CODEC_FLAG_EMU_EDGE;
return 0;
}
@ -168,7 +172,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
static av_cold int decode_end(AVCodecContext *avctx)
{
KgvContext * const c = avctx->priv_data;
av_frame_free(&c->prev);
return 0;
}