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

indeo2: make code independent of sizeof(AVFrame)

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-07-26 14:58:44 +00:00
parent 76e27b1d05
commit 451b2ca1b4
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavcodec/indeo2.c
View File

@ -34,7 +34,7 @@
typedef struct Ir2Context{ typedef struct Ir2Context{
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame picture; AVFrame *picture;
GetBitContext gb; GetBitContext gb;
int decode_delta; int decode_delta;
} Ir2Context; } Ir2Context;
@ -146,7 +146,7 @@ static int ir2_decode_frame(AVCodecContext *avctx,
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
AVFrame *picture = data; AVFrame *picture = data;
AVFrame * const p = &s->picture; AVFrame * const p = s->picture;
int start, ret; int start, ret;
if ((ret = ff_reget_buffer(avctx, p)) < 0) if ((ret = ff_reget_buffer(avctx, p)) < 0)
@ -171,36 +171,36 @@ static int ir2_decode_frame(AVCodecContext *avctx,
if (s->decode_delta) { /* intraframe */ if (s->decode_delta) { /* intraframe */
if ((ret = ir2_decode_plane(s, avctx->width, avctx->height, if ((ret = ir2_decode_plane(s, avctx->width, avctx->height,
s->picture.data[0], s->picture.linesize[0], s->picture->data[0], s->picture->linesize[0],
ir2_luma_table)) < 0) ir2_luma_table)) < 0)
return ret; return ret;
/* swapped U and V */ /* swapped U and V */
if ((ret = ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 2, if ((ret = ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 2,
s->picture.data[2], s->picture.linesize[2], s->picture->data[2], s->picture->linesize[2],
ir2_luma_table)) < 0) ir2_luma_table)) < 0)
return ret; return ret;
if ((ret = ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 2, if ((ret = ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 2,
s->picture.data[1], s->picture.linesize[1], s->picture->data[1], s->picture->linesize[1],
ir2_luma_table)) < 0) ir2_luma_table)) < 0)
return ret; return ret;
} else { /* interframe */ } else { /* interframe */
if ((ret = ir2_decode_plane_inter(s, avctx->width, avctx->height, if ((ret = ir2_decode_plane_inter(s, avctx->width, avctx->height,
s->picture.data[0], s->picture.linesize[0], s->picture->data[0], s->picture->linesize[0],
ir2_luma_table)) < 0) ir2_luma_table)) < 0)
return ret; return ret;
/* swapped U and V */ /* swapped U and V */
if ((ret = ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 2, if ((ret = ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 2,
s->picture.data[2], s->picture.linesize[2], s->picture->data[2], s->picture->linesize[2],
ir2_luma_table)) < 0) ir2_luma_table)) < 0)
return ret; return ret;
if ((ret = ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 2, if ((ret = ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 2,
s->picture.data[1], s->picture.linesize[1], s->picture->data[1], s->picture->linesize[1],
ir2_luma_table)) < 0) ir2_luma_table)) < 0)
return ret; return ret;
} }
if ((ret = av_frame_ref(picture, &s->picture)) < 0) if ((ret = av_frame_ref(picture, s->picture)) < 0)
return ret; return ret;
*got_frame = 1; *got_frame = 1;
@ -213,12 +213,13 @@ static av_cold int ir2_decode_init(AVCodecContext *avctx)
Ir2Context * const ic = avctx->priv_data; Ir2Context * const ic = avctx->priv_data;
static VLC_TYPE vlc_tables[1 << CODE_VLC_BITS][2]; static VLC_TYPE vlc_tables[1 << CODE_VLC_BITS][2];
avcodec_get_frame_defaults(&ic->picture);
ic->avctx = avctx; ic->avctx = avctx;
avctx->pix_fmt= AV_PIX_FMT_YUV410P; avctx->pix_fmt= AV_PIX_FMT_YUV410P;
avcodec_get_frame_defaults(&ic->picture); ic->picture = av_frame_alloc();
if (!ic->picture)
return AVERROR(ENOMEM);
ir2_vlc.table = vlc_tables; ir2_vlc.table = vlc_tables;
ir2_vlc.table_allocated = 1 << CODE_VLC_BITS; ir2_vlc.table_allocated = 1 << CODE_VLC_BITS;
@ -238,9 +239,8 @@ static av_cold int ir2_decode_init(AVCodecContext *avctx)
static av_cold int ir2_decode_end(AVCodecContext *avctx) static av_cold int ir2_decode_end(AVCodecContext *avctx)
{ {
Ir2Context * const ic = avctx->priv_data; Ir2Context * const ic = avctx->priv_data;
AVFrame *pic = &ic->picture;
av_frame_unref(pic); av_frame_free(&ic->picture);
return 0; return 0;
} }