virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9'

Browse Source 
* commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9':
  escape124: use the AVFrame API properly.
  qtrle: use the AVFrame API properly.
  cljr: use the AVFrame API properly.
  cinepak: use the AVFrame API properly.

Conflicts:
	libavcodec/cinepak.c
	libavcodec/cljr.c
	libavcodec/qtrle.c

See: 80e9e63c libavcodec/cinepak.c
See: 71c378984b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-17 00:40:59 +01:00
commit bfb1f44d24
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/cljr.c
View File

@ -99,16 +99,21 @@ AVCodec ff_cljr_decoder = {
#if CONFIG_CLJR_ENCODER #if CONFIG_CLJR_ENCODER
typedef struct CLJRContext { typedef struct CLJRContext {
AVClass *avclass; AVClass *avclass;
AVFrame picture;
int dither_type; int dither_type;
} CLJRContext; } CLJRContext;
static av_cold int encode_init(AVCodecContext *avctx) static av_cold int encode_init(AVCodecContext *avctx)
{ {
CLJRContext * const a = avctx->priv_data; avctx->coded_frame = av_frame_alloc();
if (!avctx->coded_frame)
return AVERROR(ENOMEM);
avctx->coded_frame = &a->picture; return 0;
}
static av_cold int encode_close(AVCodecContext *avctx)
{
av_frame_free(&avctx->coded_frame);
return 0; return 0;
} }
@ -183,6 +188,7 @@ AVCodec ff_cljr_encoder = {
.priv_data_size = sizeof(CLJRContext), .priv_data_size = sizeof(CLJRContext),
.init = encode_init, .init = encode_init,
.encode2 = encode_frame, .encode2 = encode_frame,
.close = encode_close,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P,
AV_PIX_FMT_NONE }, AV_PIX_FMT_NONE },
.priv_class = &cljr_class, .priv_class = &cljr_class,

21
libavcodec/escape124.c
View File

@ -42,7 +42,7 @@ typedef struct CodeBook {
} CodeBook; } CodeBook;
typedef struct Escape124Context { typedef struct Escape124Context {
AVFrame frame; AVFrame *frame;
unsigned num_superblocks; unsigned num_superblocks;
@ -58,12 +58,15 @@ static av_cold int escape124_decode_init(AVCodecContext *avctx)
{ {
Escape124Context *s = avctx->priv_data; Escape124Context *s = avctx->priv_data;
avcodec_get_frame_defaults(&s->frame);
avctx->pix_fmt = AV_PIX_FMT_RGB555; avctx->pix_fmt = AV_PIX_FMT_RGB555;
s->num_superblocks = ((unsigned)avctx->width / 8) * s->num_superblocks = ((unsigned)avctx->width / 8) *
((unsigned)avctx->height / 8); ((unsigned)avctx->height / 8);
s->frame = av_frame_alloc();
if (!s->frame)
return AVERROR(ENOMEM);
return 0; return 0;
} }
@ -75,7 +78,7 @@ static av_cold int escape124_decode_close(AVCodecContext *avctx)
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
av_free(s->codebooks[i].blocks); av_free(s->codebooks[i].blocks);
av_frame_unref(&s->frame); av_frame_free(&s->frame);
return 0; return 0;
} }
@ -227,13 +230,13 @@ static int escape124_decode_frame(AVCodecContext *avctx,
// Leave last frame unchanged // Leave last frame unchanged
// FIXME: Is this necessary? I haven't seen it in any real samples // FIXME: Is this necessary? I haven't seen it in any real samples
if (!(frame_flags & 0x114) || !(frame_flags & 0x7800000)) { if (!(frame_flags & 0x114) || !(frame_flags & 0x7800000)) {
if (!s->frame.data[0]) if (!s->frame->data[0])
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
av_log(avctx, AV_LOG_DEBUG, "Skipping frame\n"); av_log(avctx, AV_LOG_DEBUG, "Skipping frame\n");
*got_frame = 1; *got_frame = 1;
if ((ret = av_frame_ref(frame, &s->frame)) < 0) if ((ret = av_frame_ref(frame, s->frame)) < 0)
return ret; return ret;
return frame_size; return frame_size;
@ -272,8 +275,8 @@ static int escape124_decode_frame(AVCodecContext *avctx,
new_frame_data = (uint16_t*)frame->data[0]; new_frame_data = (uint16_t*)frame->data[0];
new_stride = frame->linesize[0] / 2; new_stride = frame->linesize[0] / 2;
old_frame_data = (uint16_t*)s->frame.data[0]; old_frame_data = (uint16_t*)s->frame->data[0];
old_stride = s->frame.linesize[0] / 2; old_stride = s->frame->linesize[0] / 2;
for (superblock_index = 0; superblock_index < s->num_superblocks; for (superblock_index = 0; superblock_index < s->num_superblocks;
superblock_index++) { superblock_index++) {
@ -350,8 +353,8 @@ static int escape124_decode_frame(AVCodecContext *avctx,
"Escape sizes: %i, %i, %i\n", "Escape sizes: %i, %i, %i\n",
frame_size, buf_size, get_bits_count(&gb) / 8); frame_size, buf_size, get_bits_count(&gb) / 8);
av_frame_unref(&s->frame); av_frame_unref(s->frame);
if ((ret = av_frame_ref(&s->frame, frame)) < 0) if ((ret = av_frame_ref(s->frame, frame)) < 0)
return ret; return ret;
*got_frame = 1; *got_frame = 1;