#include "avcodec.h"
#include "get_bits.h"
#include "indeo2data.h"
+#include "internal.h"
#include "mathops.h"
typedef struct Ir2Context{
AVCodecContext *avctx;
- AVFrame picture;
+ AVFrame *picture;
GetBitContext gb;
int decode_delta;
} Ir2Context;
}
static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst,
- int stride, const uint8_t *table)
+ int pitch, const uint8_t *table)
{
int i;
int j;
dst[out++] = table[(c * 2) + 1];
}
}
- dst += stride;
+ dst += pitch;
for (j = 1; j < height; j++) {
out = 0;
if (out + c*2 > width)
return AVERROR_INVALIDDATA;
for (i = 0; i < c * 2; i++) {
- dst[out] = dst[out - stride];
+ dst[out] = dst[out - pitch];
out++;
}
} else { /* add two deltas from table */
- t = dst[out - stride] + (table[c * 2] - 128);
+ t = dst[out - pitch] + (table[c * 2] - 128);
t = av_clip_uint8(t);
dst[out] = t;
out++;
- t = dst[out - stride] + (table[(c * 2) + 1] - 128);
+ t = dst[out - pitch] + (table[(c * 2) + 1] - 128);
t = av_clip_uint8(t);
dst[out] = t;
out++;
}
}
- dst += stride;
+ dst += pitch;
}
return 0;
}
static int ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8_t *dst,
- int stride, const uint8_t *table)
+ int pitch, const uint8_t *table)
{
int j;
int out = 0;
out++;
}
}
- dst += stride;
+ dst += pitch;
}
return 0;
}
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
AVFrame *picture = data;
- AVFrame * const p = &s->picture;
+ AVFrame * const p = s->picture;
int start, ret;
- if (p->data[0])
- avctx->release_buffer(avctx, p);
-
- p->reference = 1;
- p->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if ((ret = avctx->reget_buffer(avctx, p)) < 0) {
+ if ((ret = ff_reget_buffer(avctx, p)) < 0) {
av_log(s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return ret;
}
if (s->decode_delta) { /* intraframe */
if ((ret = ir2_decode_plane(s, avctx->width, avctx->height,
- s->picture.data[0], s->picture.linesize[0],
+ p->data[0], p->linesize[0],
ir2_luma_table)) < 0)
return ret;
/* swapped U and V */
if ((ret = ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 2,
- s->picture.data[2], s->picture.linesize[2],
+ p->data[2], p->linesize[2],
ir2_luma_table)) < 0)
return ret;
if ((ret = ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 2,
- s->picture.data[1], s->picture.linesize[1],
+ p->data[1], p->linesize[1],
ir2_luma_table)) < 0)
return ret;
} else { /* interframe */
if ((ret = ir2_decode_plane_inter(s, avctx->width, avctx->height,
- s->picture.data[0], s->picture.linesize[0],
+ p->data[0], p->linesize[0],
ir2_luma_table)) < 0)
return ret;
/* swapped U and V */
if ((ret = ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 2,
- s->picture.data[2], s->picture.linesize[2],
+ p->data[2], p->linesize[2],
ir2_luma_table)) < 0)
return ret;
if ((ret = ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 2,
- s->picture.data[1], s->picture.linesize[1],
+ p->data[1], p->linesize[1],
ir2_luma_table)) < 0)
return ret;
}
- *picture = s->picture;
+ if ((ret = av_frame_ref(picture, p)) < 0)
+ return ret;
+
*got_frame = 1;
return buf_size;
avctx->pix_fmt= AV_PIX_FMT_YUV410P;
+ ic->picture = av_frame_alloc();
+ if (!ic->picture)
+ return AVERROR(ENOMEM);
+
ir2_vlc.table = vlc_tables;
ir2_vlc.table_allocated = 1 << CODE_VLC_BITS;
#ifdef BITSTREAM_READER_LE
static av_cold int ir2_decode_end(AVCodecContext *avctx)
{
Ir2Context * const ic = avctx->priv_data;
- AVFrame *pic = &ic->picture;
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
+ av_frame_free(&ic->picture);
return 0;
}
AVCodec ff_indeo2_decoder = {
.name = "indeo2",
+ .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_INDEO2,
.priv_data_size = sizeof(Ir2Context),
.close = ir2_decode_end,
.decode = ir2_decode_frame,
.capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"),
};