* Indeo Video Interactive v5 compatible decoder
* Copyright (c) 2009 Maxim Poliakovski
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
- * @file libavcodec/indeo5.c
+ * @file
* Indeo Video Interactive version 5 decoder
*
* Indeo5 data is usually transported within .avi or .mov files.
* Known FOURCCs: 'IV50'
*/
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
+#include "dsputil.h"
#include "ivi_dsp.h"
#include "ivi_common.h"
#include "indeo5data.h"
#define IVI5_PIC_SIZE_ESC 15
-#define IVI5_IS_PROTECTED 0x20
-
-typedef struct {
- GetBitContext gb;
- AVFrame frame;
- RVMapDesc rvmap_tabs[9]; ///< local corrected copy of the static rvmap tables
- IVIPlaneDesc planes[3]; ///< color planes
- const uint8_t *frame_data; ///< input frame data pointer
- int buf_switch; ///< used to switch between three buffers
- int dst_buf;
- int ref_buf;
- uint32_t frame_size; ///< frame size in bytes
- int frame_type;
- int prev_frame_type; ///< frame type of the previous frame
- int frame_num;
- uint32_t pic_hdr_size; ///< picture header size in bytes
- uint8_t frame_flags;
- uint16_t checksum; ///< frame checksum
-
- int16_t mb_huff_sel; ///< MB huffman table selector
- IVIHuffDesc mb_huff_desc; ///< MB table descriptor associated with the selector above
- VLC *mb_vlc; ///< ptr to the vlc table for decoding macroblock data
- VLC mb_vlc_cust; ///< custom macroblock vlc table
-
- uint16_t gop_hdr_size;
- uint8_t gop_flags;
- int is_scalable;
- uint32_t lock_word;
- IVIPicConfig pic_conf;
-} IVI5DecContext;
-
-//! static vlc tables (initialized at startup)
-static VLC mb_vlc_tabs [8];
-static VLC blk_vlc_tabs[8];
-
-
/**
- * Decodes Indeo5 GOP (Group of pictures) header.
+ * Decode Indeo5 GOP (Group of pictures) header.
* This header is present in key frames only.
* It defines parameters for all frames in a GOP.
*
- * @param ctx [in,out] ptr to the decoder context
- * @param avctx [in] ptr to the AVCodecContext
+ * @param[in,out] ctx ptr to the decoder context
+ * @param[in] avctx ptr to the AVCodecContext
* @return result code: 0 = OK, -1 = error
*/
-static int decode_gop_header(IVI5DecContext *ctx, AVCodecContext *avctx)
+static int decode_gop_header(IVI45DecContext *ctx, AVCodecContext *avctx)
{
- int result, i, p, tile_size, pic_size_indx, mb_size, blk_size, blk_size_changed = 0;
+ int result, i, p, tile_size, pic_size_indx, mb_size, blk_size;
+ int quant_mat, blk_size_changed = 0;
IVIBandDesc *band, *band1, *band2;
IVIPicConfig pic_conf;
case 0:
band->inv_transform = ff_ivi_inverse_slant_8x8;
band->dc_transform = ff_ivi_dc_slant_2d;
- band->scan = ivi5_scans8x8[0];
+ band->scan = ff_zigzag_direct;
break;
case 1:
band->inv_transform = ff_ivi_row_slant8;
band->dc_transform = ff_ivi_dc_row_slant;
- band->scan = ivi5_scans8x8[1];
+ band->scan = ff_ivi_vertical_scan_8x8;
break;
case 2:
band->inv_transform = ff_ivi_col_slant8;
band->dc_transform = ff_ivi_dc_col_slant;
- band->scan = ivi5_scans8x8[2];
+ band->scan = ff_ivi_horizontal_scan_8x8;
break;
case 3:
band->inv_transform = ff_ivi_put_pixels_8x8;
band->dc_transform = ff_ivi_put_dc_pixel_8x8;
- band->scan = ivi5_scans8x8[2];
+ band->scan = ff_ivi_horizontal_scan_8x8;
break;
case 4:
band->inv_transform = ff_ivi_inverse_slant_4x4;
band->dc_transform = ff_ivi_dc_slant_2d;
- band->scan = ivi5_scan4x4;
+ band->scan = ff_ivi_direct_scan_4x4;
break;
}
/* select dequant matrix according to plane and band number */
if (!p) {
- band->quant_mat = (pic_conf.luma_bands > 1) ? i+1 : 0;
+ quant_mat = (pic_conf.luma_bands > 1) ? i+1 : 0;
} else {
- band->quant_mat = 5;
+ quant_mat = 5;
+ }
+
+ if (band->blk_size == 8) {
+ band->intra_base = &ivi5_base_quant_8x8_intra[quant_mat][0];
+ band->inter_base = &ivi5_base_quant_8x8_inter[quant_mat][0];
+ band->intra_scale = &ivi5_scale_quant_8x8_intra[quant_mat][0];
+ band->inter_scale = &ivi5_scale_quant_8x8_inter[quant_mat][0];
+ } else {
+ band->intra_base = ivi5_base_quant_4x4_intra;
+ band->inter_base = ivi5_base_quant_4x4_inter;
+ band->intra_scale = ivi5_scale_quant_4x4_intra;
+ band->inter_scale = ivi5_scale_quant_4x4_inter;
}
if (get_bits(&ctx->gb, 2)) {
band2->mb_size = band1->mb_size;
band2->blk_size = band1->blk_size;
band2->is_halfpel = band1->is_halfpel;
- band2->quant_mat = band1->quant_mat;
+ band2->intra_base = band1->intra_base;
+ band2->inter_base = band1->inter_base;
+ band2->intra_scale = band1->intra_scale;
+ band2->inter_scale = band1->inter_scale;
band2->scan = band1->scan;
band2->inv_transform = band1->inv_transform;
band2->dc_transform = band1->dc_transform;
/**
- * Skips a header extension.
+ * Skip a header extension.
*
- * @param gb [in,out] the GetBit context
+ * @param[in,out] gb the GetBit context
*/
static inline void skip_hdr_extension(GetBitContext *gb)
{
/**
- * Decodes Indeo5 picture header.
+ * Decode Indeo5 picture header.
*
- * @param ctx [in,out] ptr to the decoder context
- * @param avctx [in] ptr to the AVCodecContext
+ * @param[in,out] ctx ptr to the decoder context
+ * @param[in] avctx ptr to the AVCodecContext
* @return result code: 0 = OK, -1 = error
*/
-static int decode_pic_hdr(IVI5DecContext *ctx, AVCodecContext *avctx)
+static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx)
{
- int result;
- IVIHuffDesc new_huff;
-
if (get_bits(&ctx->gb, 5) != 0x1F) {
av_log(avctx, AV_LOG_ERROR, "Invalid picture start code!\n");
return -1;
ctx->frame_num = get_bits(&ctx->gb, 8);
if (ctx->frame_type == FRAMETYPE_INTRA) {
- if (decode_gop_header(ctx, avctx))
- return -1;
+ ctx->gop_invalid = 1;
+ if (decode_gop_header(ctx, avctx)) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid GOP header, skipping frames.\n");
+ return AVERROR_INVALIDDATA;
+ }
+ ctx->gop_invalid = 0;
}
if (ctx->frame_type != FRAMETYPE_NULL) {
skip_hdr_extension(&ctx->gb); /* XXX: untested */
/* decode macroblock huffman codebook */
- if (ctx->frame_flags & 0x40) {
- ctx->mb_huff_sel = ff_ivi_dec_huff_desc(&ctx->gb, &new_huff);
- if (ctx->mb_huff_sel != 7) {
- ctx->mb_vlc = &mb_vlc_tabs[ctx->mb_huff_sel];
- } else {
- if (ff_ivi_huff_desc_cmp(&new_huff, &ctx->mb_huff_desc)) {
- ff_ivi_huff_desc_copy(&ctx->mb_huff_desc, &new_huff);
-
- if (ctx->mb_vlc_cust.table)
- free_vlc(&ctx->mb_vlc_cust);
- result = ff_ivi_create_huff_from_desc(&ctx->mb_huff_desc,
- &ctx->mb_vlc_cust, 0);
- if (result) {
- av_log(avctx, AV_LOG_ERROR, "Error while initializing custom macroblock vlc table!\n");
- return -1;
- }
- }
- ctx->mb_vlc = &ctx->mb_vlc_cust;
- }
- } else {
- ctx->mb_vlc = &mb_vlc_tabs[7]; /* select the default macroblock huffman table */
- }
+ if (ff_ivi_dec_huff_desc(&ctx->gb, ctx->frame_flags & 0x40, IVI_MB_HUFF, &ctx->mb_vlc, avctx))
+ return -1;
skip_bits(&ctx->gb, 3); /* FIXME: unknown meaning! */
}
/**
- * Decodes Indeo5 band header.
+ * Decode Indeo5 band header.
*
- * @param ctx [in,out] ptr to the decoder context
- * @param band [in,out] ptr to the band descriptor
- * @param avctx [in] ptr to the AVCodecContext
+ * @param[in,out] ctx ptr to the decoder context
+ * @param[in,out] band ptr to the band descriptor
+ * @param[in] avctx ptr to the AVCodecContext
* @return result code: 0 = OK, -1 = error
*/
-static int decode_band_hdr(IVI5DecContext *ctx, IVIBandDesc *band,
+static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band,
AVCodecContext *avctx)
{
- int i, result;
+ int i;
uint8_t band_flags;
- IVIHuffDesc new_huff;
band_flags = get_bits(&ctx->gb, 8);
band->rvmap_sel = (band_flags & 0x40) ? get_bits(&ctx->gb, 3) : 8;
/* decode block huffman codebook */
- if (band_flags & 0x80) {
- band->huff_sel = ff_ivi_dec_huff_desc(&ctx->gb, &new_huff);
- if (band->huff_sel != 7) {
- band->blk_vlc = &blk_vlc_tabs[band->huff_sel];
- } else {
- if (ff_ivi_huff_desc_cmp(&new_huff, &band->huff_desc)) {
- ff_ivi_huff_desc_copy(&band->huff_desc, &new_huff);
-
- if (band->blk_vlc_cust.table)
- free_vlc(&band->blk_vlc_cust);
- result = ff_ivi_create_huff_from_desc(&band->huff_desc,
- &band->blk_vlc_cust, 0);
- if (result) {
- av_log(avctx, AV_LOG_ERROR, "Error while initializing custom block vlc table!\n");
- return -1;
- }
- }
- band->blk_vlc = &band->blk_vlc_cust;
- }
- } else {
- band->blk_vlc = &blk_vlc_tabs[7]; /* select the default macroblock huffman table */
- }
+ if (ff_ivi_dec_huff_desc(&ctx->gb, band_flags & 0x80, IVI_BLK_HUFF, &band->blk_vlc, avctx))
+ return -1;
band->checksum_present = get_bits1(&ctx->gb);
if (band->checksum_present)
/**
- * Decodes info (block type, cbp, quant delta, motion vector)
+ * Decode info (block type, cbp, quant delta, motion vector)
* for all macroblocks in the current tile.
*
- * @param ctx [in,out] ptr to the decoder context
- * @param band [in,out] ptr to the band descriptor
- * @param tile [in,out] ptr to the tile descriptor
- * @param avctx [in] ptr to the AVCodecContext
+ * @param[in,out] ctx ptr to the decoder context
+ * @param[in,out] band ptr to the band descriptor
+ * @param[in,out] tile ptr to the tile descriptor
+ * @param[in] avctx ptr to the AVCodecContext
* @return result code: 0 = OK, -1 = error
*/
-static int decode_mb_info(IVI5DecContext *ctx, IVIBandDesc *band,
+static int decode_mb_info(IVI45DecContext *ctx, IVIBandDesc *band,
IVITile *tile, AVCodecContext *avctx)
{
int x, y, mv_x, mv_y, mv_delta, offs, mb_offset,
ref_mb = tile->ref_mbs;
offs = tile->ypos * band->pitch + tile->xpos;
+ if (!ref_mb &&
+ ((band->qdelta_present && band->inherit_qdelta) || band->inherit_mv))
+ return AVERROR_INVALIDDATA;
+
+ if (tile->num_MBs != IVI_MBs_PER_TILE(tile->width, tile->height, band->mb_size)) {
+ av_log(avctx, AV_LOG_ERROR, "Allocated tile size %d mismatches parameters %d\n",
+ tile->num_MBs, IVI_MBs_PER_TILE(tile->width, tile->height, band->mb_size));
+ return AVERROR_INVALIDDATA;
+ }
+
/* scale factor for motion vectors */
mv_scale = (ctx->planes[0].bands[0].mb_size >> 3) - (band->mb_size >> 3);
mv_x = mv_y = 0;
mb->q_delta = 0;
if (!band->plane && !band->band_num && (ctx->frame_flags & 8)) {
- mb->q_delta = get_vlc2(&ctx->gb, ctx->mb_vlc->table,
+ mb->q_delta = get_vlc2(&ctx->gb, ctx->mb_vlc.tab->table,
IVI_VLC_BITS, 1);
mb->q_delta = IVI_TOSIGNED(mb->q_delta);
}
if (ref_mb) mb->q_delta = ref_mb->q_delta;
} else if (mb->cbp || (!band->plane && !band->band_num &&
(ctx->frame_flags & 8))) {
- mb->q_delta = get_vlc2(&ctx->gb, ctx->mb_vlc->table,
+ mb->q_delta = get_vlc2(&ctx->gb, ctx->mb_vlc.tab->table,
IVI_VLC_BITS, 1);
mb->q_delta = IVI_TOSIGNED(mb->q_delta);
}
}
} else {
/* decode motion vector deltas */
- mv_delta = get_vlc2(&ctx->gb, ctx->mb_vlc->table,
+ mv_delta = get_vlc2(&ctx->gb, ctx->mb_vlc.tab->table,
IVI_VLC_BITS, 1);
mv_y += IVI_TOSIGNED(mv_delta);
- mv_delta = get_vlc2(&ctx->gb, ctx->mb_vlc->table,
+ mv_delta = get_vlc2(&ctx->gb, ctx->mb_vlc.tab->table,
IVI_VLC_BITS, 1);
mv_x += IVI_TOSIGNED(mv_delta);
mb->mv_x = mv_x;
/**
- * Decodes an Indeo5 band.
+ * Switch buffers.
*
- * @param ctx [in,out] ptr to the decoder context
- * @param band [in,out] ptr to the band descriptor
- * @param avctx [in] ptr to the AVCodecContext
- * @return result code: 0 = OK, -1 = error
+ * @param[in,out] ctx ptr to the decoder context
*/
-static int decode_band(IVI5DecContext *ctx, int plane_num,
- IVIBandDesc *band, AVCodecContext *avctx)
+static void switch_buffers(IVI45DecContext *ctx)
{
- int result, i, t, idx1, idx2;
- IVITile *tile;
- uint16_t chksum;
-
- band->buf = band->bufs[ctx->dst_buf];
- band->ref_buf = band->bufs[ctx->ref_buf];
- band->data_ptr = ctx->frame_data + (get_bits_count(&ctx->gb) >> 3);
-
- result = decode_band_hdr(ctx, band, avctx);
- if (result) {
- av_log(avctx, AV_LOG_ERROR, "Error while decoding band header: %d\n",
- result);
- return -1;
- }
-
- if (band->is_empty) {
- av_log(avctx, AV_LOG_ERROR, "Empty band encountered!\n");
- return -1;
- }
-
- band->rv_map = &ctx->rvmap_tabs[band->rvmap_sel];
-
- /* apply corrections to the selected rvmap table if present */
- for (i = 0; i < band->num_corr; i++) {
- idx1 = band->corr[i*2];
- idx2 = band->corr[i*2+1];
- FFSWAP(uint8_t, band->rv_map->runtab[idx1], band->rv_map->runtab[idx2]);
- FFSWAP(int16_t, band->rv_map->valtab[idx1], band->rv_map->valtab[idx2]);
- }
-
- for (t = 0; t < band->num_tiles; t++) {
- tile = &band->tiles[t];
-
- tile->is_empty = get_bits1(&ctx->gb);
- if (tile->is_empty) {
- ff_ivi_process_empty_tile(avctx, band, tile,
- (ctx->planes[0].bands[0].mb_size >> 3) - (band->mb_size >> 3));
- align_get_bits(&ctx->gb);
- } else {
- tile->data_size = ff_ivi_dec_tile_data_size(&ctx->gb);
-
- result = decode_mb_info(ctx, band, tile, avctx);
- if (result < 0)
- break;
-
- if (band->blk_size == 8) {
- band->intra_base = &ivi5_base_quant_8x8_intra[band->quant_mat][0];
- band->inter_base = &ivi5_base_quant_8x8_inter[band->quant_mat][0];
- band->intra_scale = &ivi5_scale_quant_8x8_intra[band->quant_mat][0];
- band->inter_scale = &ivi5_scale_quant_8x8_inter[band->quant_mat][0];
- } else {
- band->intra_base = ivi5_base_quant_4x4_intra;
- band->inter_base = ivi5_base_quant_4x4_inter;
- band->intra_scale = ivi5_scale_quant_4x4_intra;
- band->inter_scale = ivi5_scale_quant_4x4_inter;
- }
-
- result = ff_ivi_decode_blocks(&ctx->gb, band, tile);
- if (result < 0) {
- av_log(avctx, AV_LOG_ERROR, "Corrupted blocks data encountered!\n");
- break;
- }
- }
- }
-
- /* restore the selected rvmap table by applying its corrections in reverse order */
- for (i = band->num_corr-1; i >= 0; i--) {
- idx1 = band->corr[i*2];
- idx2 = band->corr[i*2+1];
- FFSWAP(uint8_t, band->rv_map->runtab[idx1], band->rv_map->runtab[idx2]);
- FFSWAP(int16_t, band->rv_map->valtab[idx1], band->rv_map->valtab[idx2]);
- }
-
- if (IVI_DEBUG && band->checksum_present) {
- chksum = ivi_calc_band_checksum(band);
- if (chksum != band->checksum) {
- av_log(avctx, AV_LOG_ERROR,
- "Band checksum mismatch! Plane %d, band %d, received: %x, calculated: %x\n",
- band->plane, band->band_num, band->checksum, chksum);
+ switch (ctx->prev_frame_type) {
+ case FRAMETYPE_INTRA:
+ case FRAMETYPE_INTER:
+ ctx->buf_switch ^= 1;
+ ctx->dst_buf = ctx->buf_switch;
+ ctx->ref_buf = ctx->buf_switch ^ 1;
+ break;
+ case FRAMETYPE_INTER_SCAL:
+ if (!ctx->inter_scal) {
+ ctx->ref2_buf = 2;
+ ctx->inter_scal = 1;
}
+ FFSWAP(int, ctx->dst_buf, ctx->ref2_buf);
+ ctx->ref_buf = ctx->ref2_buf;
+ break;
+ case FRAMETYPE_INTER_NOREF:
+ break;
}
- return result;
-}
-
-
-/**
- * Switches buffers.
- *
- * @param ctx [in,out] ptr to the decoder context
- * @param avctx [in] ptr to the AVCodecContext
- */
-static void switch_buffers(IVI5DecContext *ctx, AVCodecContext *avctx)
-{
switch (ctx->frame_type) {
case FRAMETYPE_INTRA:
ctx->buf_switch = 0;
- ctx->dst_buf = 0;
- ctx->ref_buf = 0;
- break;
+ /* FALLTHROUGH */
case FRAMETYPE_INTER:
- ctx->buf_switch &= 1;
- /* swap buffers only if there were no droppable frames */
- if (ctx->prev_frame_type != FRAMETYPE_INTER_NOREF &&
- ctx->prev_frame_type != FRAMETYPE_INTER_SCAL)
- ctx->buf_switch ^= 1;
+ ctx->inter_scal = 0;
ctx->dst_buf = ctx->buf_switch;
ctx->ref_buf = ctx->buf_switch ^ 1;
break;
case FRAMETYPE_INTER_SCAL:
- if (ctx->prev_frame_type == FRAMETYPE_INTER_NOREF)
- break;
- if (ctx->prev_frame_type != FRAMETYPE_INTER_SCAL) {
- ctx->buf_switch ^= 1;
- ctx->dst_buf = ctx->buf_switch;
- ctx->ref_buf = ctx->buf_switch ^ 1;
- } else {
- ctx->buf_switch ^= 2;
- ctx->dst_buf = 2;
- ctx->ref_buf = ctx->buf_switch & 1;
- if (!(ctx->buf_switch & 2))
- FFSWAP(int, ctx->dst_buf, ctx->ref_buf);
- }
- break;
case FRAMETYPE_INTER_NOREF:
- if (ctx->prev_frame_type == FRAMETYPE_INTER_SCAL) {
- ctx->buf_switch ^= 2;
- ctx->dst_buf = 2;
- ctx->ref_buf = ctx->buf_switch & 1;
- if (!(ctx->buf_switch & 2))
- FFSWAP(int, ctx->dst_buf, ctx->ref_buf);
- } else {
- ctx->buf_switch ^= 1;
- ctx->dst_buf = ctx->buf_switch & 1;
- ctx->ref_buf = (ctx->buf_switch & 1) ^ 1;
- }
- break;
case FRAMETYPE_NULL:
- return;
- default:
- av_log(avctx, AV_LOG_ERROR, "unsupported frame type: %d\n", ctx->frame_type);
+ break;
}
}
+static int is_nonnull_frame(IVI45DecContext *ctx)
+{
+ return ctx->frame_type != FRAMETYPE_NULL;
+}
+
+
/**
- * Initializes Indeo5 decoder.
+ * Initialize Indeo5 decoder.
*/
static av_cold int decode_init(AVCodecContext *avctx)
{
- IVI5DecContext *ctx = avctx->priv_data;
- int i, result;
+ IVI45DecContext *ctx = avctx->priv_data;
+ int result;
- /* initialize static vlc tables for macroblock/block signals */
- for (i = 0; i < 8; i++) {
- ff_ivi_create_huff_from_desc(&ff_ivi_mb_huff_desc[i], &mb_vlc_tabs[i], 1);
- ff_ivi_create_huff_from_desc(&ff_ivi_blk_huff_desc[i], &blk_vlc_tabs[i], 1);
- }
+ ff_ivi_init_static_vlc();
/* copy rvmap tables in our context so we can apply changes to them */
memcpy(ctx->rvmap_tabs, ff_ivi_rvmap_tabs, sizeof(ff_ivi_rvmap_tabs));
return -1;
}
- avctx->pix_fmt = PIX_FMT_YUV410P;
-
- return 0;
-}
-
-
-/**
- * main decoder function
- */
-static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
- AVPacket *avpkt)
-{
- IVI5DecContext *ctx = avctx->priv_data;
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- int result, p, b;
-
- init_get_bits(&ctx->gb, buf, buf_size * 8);
- ctx->frame_data = buf;
- ctx->frame_size = buf_size;
-
- result = decode_pic_hdr(ctx, avctx);
- if (result) {
- av_log(avctx, AV_LOG_ERROR,
- "Error while decoding picture header: %d\n", result);
- return -1;
- }
-
- if (ctx->gop_flags & IVI5_IS_PROTECTED) {
- av_log(avctx, AV_LOG_ERROR, "Password-protected clip!\n");
- return -1;
- }
-
- switch_buffers(ctx, avctx);
-
- //START_TIMER;
-
- if (ctx->frame_type == FRAMETYPE_NULL) {
- ctx->frame_type = ctx->prev_frame_type;
- } else {
- for (p = 0; p < 3; p++) {
- for (b = 0; b < ctx->planes[p].num_bands; b++) {
- result = decode_band(ctx, p, &ctx->planes[p].bands[b], avctx);
- if (result) {
- av_log(avctx, AV_LOG_ERROR,
- "Error while decoding band: %d, plane: %d\n", b, p);
- return -1;
- }
- }
- }
- }
-
- //STOP_TIMER("decode_planes");
-
- if (ctx->frame.data[0])
- avctx->release_buffer(avctx, &ctx->frame);
-
- ctx->frame.reference = 0;
- if (avctx->get_buffer(avctx, &ctx->frame) < 0) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
- }
-
- if (ctx->is_scalable) {
- ff_ivi_recompose53 (&ctx->planes[0], ctx->frame.data[0], ctx->frame.linesize[0], 4);
- } else {
- ff_ivi_output_plane(&ctx->planes[0], ctx->frame.data[0], ctx->frame.linesize[0]);
- }
-
- ff_ivi_output_plane(&ctx->planes[2], ctx->frame.data[1], ctx->frame.linesize[1]);
- ff_ivi_output_plane(&ctx->planes[1], ctx->frame.data[2], ctx->frame.linesize[2]);
-
- *data_size = sizeof(AVFrame);
- *(AVFrame*)data = ctx->frame;
-
- return buf_size;
-}
-
-
-/**
- * Closes Indeo5 decoder and cleans up its context.
- */
-static av_cold int decode_close(AVCodecContext *avctx)
-{
- IVI5DecContext *ctx = avctx->priv_data;
+ ctx->buf_switch = 0;
+ ctx->inter_scal = 0;
- ff_ivi_free_buffers(&ctx->planes[0]);
+ ctx->decode_pic_hdr = decode_pic_hdr;
+ ctx->decode_band_hdr = decode_band_hdr;
+ ctx->decode_mb_info = decode_mb_info;
+ ctx->switch_buffers = switch_buffers;
+ ctx->is_nonnull_frame = is_nonnull_frame;
- if (ctx->frame.data[0])
- avctx->release_buffer(avctx, &ctx->frame);
+ avctx->pix_fmt = AV_PIX_FMT_YUV410P;
return 0;
}
-AVCodec indeo5_decoder = {
+AVCodec ff_indeo5_decoder = {
.name = "indeo5",
- .type = CODEC_TYPE_VIDEO,
- .id = CODEC_ID_INDEO5,
- .priv_data_size = sizeof(IVI5DecContext),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_INDEO5,
+ .priv_data_size = sizeof(IVI45DecContext),
.init = decode_init,
- .close = decode_close,
- .decode = decode_frame,
+ .close = ff_ivi_decode_close,
+ .decode = ff_ivi_decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 5"),
+ .capabilities = CODEC_CAP_DR1,
};