diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 00131e3d3e..223819f841 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -66,6 +66,20 @@ * svq3 decoder. */ +typedef struct SVQ3Frame { + AVFrame *f; + + AVBufferRef *motion_val_buf[2]; + int16_t (*motion_val[2])[2]; + + AVBufferRef *mb_type_buf; + uint32_t *mb_type; + + + AVBufferRef *ref_index_buf[2]; + int8_t *ref_index[2]; +} SVQ3Frame; + typedef struct SVQ3Context { AVCodecContext *avctx; @@ -75,9 +89,9 @@ typedef struct SVQ3Context { TpelDSPContext tdsp; VideoDSPContext vdsp; - H264Picture *cur_pic; - H264Picture *next_pic; - H264Picture *last_pic; + SVQ3Frame *cur_pic; + SVQ3Frame *next_pic; + SVQ3Frame *last_pic; GetBitContext gb; GetBitContext gb_slice; uint8_t *slice_buf; @@ -417,7 +431,7 @@ static inline void svq3_mc_dir_part(SVQ3Context *s, int mx, int my, int dxy, int thirdpel, int dir, int avg) { - const H264Picture *pic = (dir == 0) ? s->last_pic : s->next_pic; + const SVQ3Frame *pic = (dir == 0) ? s->last_pic : s->next_pic; uint8_t *src, *dest; int i, emu = 0; int blocksize = 2 - (width >> 3); // 16->0, 8->1, 4->2 @@ -1326,7 +1340,7 @@ fail: return ret; } -static void free_picture(AVCodecContext *avctx, H264Picture *pic) +static void free_picture(AVCodecContext *avctx, SVQ3Frame *pic) { int i; for (i = 0; i < 2; i++) { @@ -1338,7 +1352,7 @@ static void free_picture(AVCodecContext *avctx, H264Picture *pic) av_frame_unref(pic->f); } -static int get_buffer(AVCodecContext *avctx, H264Picture *pic) +static int get_buffer(AVCodecContext *avctx, SVQ3Frame *pic) { SVQ3Context *s = avctx->priv_data; const int big_mb_num = s->mb_stride * (s->mb_height + 1) + 1; @@ -1367,10 +1381,10 @@ static int get_buffer(AVCodecContext *avctx, H264Picture *pic) pic->ref_index[i] = pic->ref_index_buf[i]->data; } } - pic->reference = !(s->pict_type == AV_PICTURE_TYPE_B); ret = ff_get_buffer(avctx, pic->f, - pic->reference ? AV_GET_BUFFER_FLAG_REF : 0); + (s->pict_type != AV_PICTURE_TYPE_B) ? + AV_GET_BUFFER_FLAG_REF : 0); if (ret < 0) goto fail; @@ -1427,7 +1441,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, return -1; if (s->pict_type != AV_PICTURE_TYPE_B) - FFSWAP(H264Picture*, s->next_pic, s->last_pic); + FFSWAP(SVQ3Frame*, s->next_pic, s->last_pic); av_frame_unref(s->cur_pic->f); @@ -1592,7 +1606,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, *got_frame = 1; if (s->pict_type != AV_PICTURE_TYPE_B) { - FFSWAP(H264Picture*, s->cur_pic, s->next_pic); + FFSWAP(SVQ3Frame*, s->cur_pic, s->next_pic); } else { av_frame_unref(s->cur_pic->f); }