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

smc: use the AVFrame API properly.

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

22
libavcodec/smc.c
View File

@ -46,7 +46,7 @@
typedef struct SmcContext { typedef struct SmcContext {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame frame; AVFrame *frame;
GetByteContext gb; GetByteContext gb;
@ -81,7 +81,7 @@ static void smc_decode_stream(SmcContext *s)
{ {
int width = s->avctx->width; int width = s->avctx->width;
int height = s->avctx->height; int height = s->avctx->height;
int stride = s->frame.linesize[0]; int stride = s->frame->linesize[0];
int i; int i;
int chunk_size; int chunk_size;
int buf_size = (int) (s->gb.buffer_end - s->gb.buffer_start); int buf_size = (int) (s->gb.buffer_end - s->gb.buffer_start);
@ -92,9 +92,9 @@ static void smc_decode_stream(SmcContext *s)
unsigned int color_flags_b; unsigned int color_flags_b;
unsigned int flag_mask; unsigned int flag_mask;
unsigned char *pixels = s->frame.data[0]; unsigned char *pixels = s->frame->data[0];
int image_size = height * s->frame.linesize[0]; int image_size = height * s->frame->linesize[0];
int row_ptr = 0; int row_ptr = 0;
int pixel_ptr = 0; int pixel_ptr = 0;
int pixel_x, pixel_y; int pixel_x, pixel_y;
@ -112,7 +112,7 @@ static void smc_decode_stream(SmcContext *s)
int color_octet_index = 0; int color_octet_index = 0;
/* make the palette available */ /* make the palette available */
memcpy(s->frame.data[1], s->pal, AVPALETTE_SIZE); memcpy(s->frame->data[1], s->pal, AVPALETTE_SIZE);
bytestream2_skip(&s->gb, 1); bytestream2_skip(&s->gb, 1);
chunk_size = bytestream2_get_be24(&s->gb); chunk_size = bytestream2_get_be24(&s->gb);
@ -417,7 +417,9 @@ static av_cold int smc_decode_init(AVCodecContext *avctx)
s->avctx = avctx; s->avctx = avctx;
avctx->pix_fmt = AV_PIX_FMT_PAL8; avctx->pix_fmt = AV_PIX_FMT_PAL8;
avcodec_get_frame_defaults(&s->frame); s->frame = av_frame_alloc();
if (!s->frame)
return AVERROR(ENOMEM);
return 0; return 0;
} }
@ -434,20 +436,20 @@ static int smc_decode_frame(AVCodecContext *avctx,
bytestream2_init(&s->gb, buf, buf_size); bytestream2_init(&s->gb, buf, buf_size);
if ((ret = ff_reget_buffer(avctx, &s->frame)) < 0) { if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) {
av_log(s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); av_log(s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return ret; return ret;
} }
if (pal) { if (pal) {
s->frame.palette_has_changed = 1; s->frame->palette_has_changed = 1;
memcpy(s->pal, pal, AVPALETTE_SIZE); memcpy(s->pal, pal, AVPALETTE_SIZE);
} }
smc_decode_stream(s); smc_decode_stream(s);
*got_frame = 1; *got_frame = 1;
if ((ret = av_frame_ref(data, &s->frame)) < 0) if ((ret = av_frame_ref(data, s->frame)) < 0)
return ret; return ret;
/* always report that the buffer was completely consumed */ /* always report that the buffer was completely consumed */
@ -458,7 +460,7 @@ static av_cold int smc_decode_end(AVCodecContext *avctx)
{ {
SmcContext *s = avctx->priv_data; SmcContext *s = avctx->priv_data;
av_frame_unref(&s->frame); av_frame_free(&s->frame);
return 0; return 0;
} }