generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/indeo4: Move frametypes into common header.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Dirk Ausserhaus 2014-05-29 13:17:49 +02:00 committed by Michael Niedermayer
parent ca2ec98cbe
commit d24673a2c8
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libavcodec/indeo4.c
View File

@ -34,19 +34,6 @@
#include "ivi_common.h" #include "ivi_common.h"
#include "indeo4data.h" #include "indeo4data.h"
/**
* Indeo 4 frame types.
*/
enum {
FRAMETYPE_INTRA = 0,
FRAMETYPE_INTRA1 = 1, ///< intra frame with slightly different bitstream coding
FRAMETYPE_INTER = 2, ///< non-droppable P-frame
FRAMETYPE_BIDIR = 3, ///< bidirectional frame
FRAMETYPE_INTER_NOREF = 4, ///< droppable P-frame
FRAMETYPE_NULL_FIRST = 5, ///< empty frame with no data
FRAMETYPE_NULL_LAST = 6 ///< empty frame with no data
};
#define IVI4_PIC_SIZE_ESC 7 #define IVI4_PIC_SIZE_ESC 7
@ -132,7 +119,7 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx)
} }
#if IVI4_STREAM_ANALYSER #if IVI4_STREAM_ANALYSER
if (ctx->frame_type == FRAMETYPE_BIDIR) if (ctx->frame_type == IVI4_FRAMETYPE_BIDIR)
ctx->has_b_frames = 1; ctx->has_b_frames = 1;
#endif #endif
@ -152,7 +139,7 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx)
ctx->data_size = get_bits1(&ctx->gb) ? get_bits(&ctx->gb, 24) : 0; ctx->data_size = get_bits1(&ctx->gb) ? get_bits(&ctx->gb, 24) : 0;
/* null frames don't contain anything else so we just return */ /* null frames don't contain anything else so we just return */
if (ctx->frame_type >= FRAMETYPE_NULL_FIRST) { if (ctx->frame_type >= IVI4_FRAMETYPE_NULL_FIRST) {
av_dlog(avctx, "Null frame encountered!\n"); av_dlog(avctx, "Null frame encountered!\n");
return 0; return 0;
} }
@ -329,7 +316,7 @@ static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band,
band->glob_quant = get_bits(&ctx->gb, 5); band->glob_quant = get_bits(&ctx->gb, 5);
if (!get_bits1(&ctx->gb) || ctx->frame_type == FRAMETYPE_INTRA) { if (!get_bits1(&ctx->gb) || ctx->frame_type == IVI4_FRAMETYPE_INTRA) {
transform_id = get_bits(&ctx->gb, 5); transform_id = get_bits(&ctx->gb, 5);
if (transform_id >= FF_ARRAY_ELEMS(transforms) || if (transform_id >= FF_ARRAY_ELEMS(transforms) ||
!transforms[transform_id].inv_trans) { !transforms[transform_id].inv_trans) {
@ -489,7 +476,7 @@ static int decode_mb_info(IVI45DecContext *ctx, IVIBandDesc *band,
offs = tile->ypos * band->pitch + tile->xpos; offs = tile->ypos * band->pitch + tile->xpos;
blks_per_mb = band->mb_size != band->blk_size ? 4 : 1; blks_per_mb = band->mb_size != band->blk_size ? 4 : 1;
mb_type_bits = ctx->frame_type == FRAMETYPE_BIDIR ? 2 : 1; mb_type_bits = ctx->frame_type == IVI4_FRAMETYPE_BIDIR ? 2 : 1;
/* scale factor for motion vectors */ /* scale factor for motion vectors */
mv_scale = (ctx->planes[0].bands[0].mb_size >> 3) - (band->mb_size >> 3); mv_scale = (ctx->planes[0].bands[0].mb_size >> 3) - (band->mb_size >> 3);
@ -509,7 +496,7 @@ static int decode_mb_info(IVI45DecContext *ctx, IVIBandDesc *band,
mb->buf_offs = mb_offset; mb->buf_offs = mb_offset;
if (get_bits1(&ctx->gb)) { if (get_bits1(&ctx->gb)) {
if (ctx->frame_type == FRAMETYPE_INTRA) { if (ctx->frame_type == IVI4_FRAMETYPE_INTRA) {
av_log(avctx, AV_LOG_ERROR, "Empty macroblock in an INTRA picture!\n"); av_log(avctx, AV_LOG_ERROR, "Empty macroblock in an INTRA picture!\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -542,8 +529,8 @@ static int decode_mb_info(IVI45DecContext *ctx, IVIBandDesc *band,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
mb->type = ref_mb->type; mb->type = ref_mb->type;
} else if (ctx->frame_type == FRAMETYPE_INTRA || } else if (ctx->frame_type == IVI4_FRAMETYPE_INTRA ||
ctx->frame_type == FRAMETYPE_INTRA1) { ctx->frame_type == IVI4_FRAMETYPE_INTRA1) {
mb->type = 0; /* mb_type is always INTRA for intra-frames */ mb->type = 0; /* mb_type is always INTRA for intra-frames */
} else { } else {
mb->type = get_bits(&ctx->gb, mb_type_bits); mb->type = get_bits(&ctx->gb, mb_type_bits);
@ -620,29 +607,29 @@ static int decode_mb_info(IVI45DecContext *ctx, IVIBandDesc *band,
static void switch_buffers(IVI45DecContext *ctx) static void switch_buffers(IVI45DecContext *ctx)
{ {
switch (ctx->prev_frame_type) { switch (ctx->prev_frame_type) {
case FRAMETYPE_INTRA: case IVI4_FRAMETYPE_INTRA:
case FRAMETYPE_INTRA1: case IVI4_FRAMETYPE_INTRA1:
case FRAMETYPE_INTER: case IVI4_FRAMETYPE_INTER:
ctx->buf_switch ^= 1; ctx->buf_switch ^= 1;
ctx->dst_buf = ctx->buf_switch; ctx->dst_buf = ctx->buf_switch;
ctx->ref_buf = ctx->buf_switch ^ 1; ctx->ref_buf = ctx->buf_switch ^ 1;
break; break;
case FRAMETYPE_INTER_NOREF: case IVI4_FRAMETYPE_INTER_NOREF:
break; break;
} }
switch (ctx->frame_type) { switch (ctx->frame_type) {
case FRAMETYPE_INTRA: case IVI4_FRAMETYPE_INTRA:
case FRAMETYPE_INTRA1: case IVI4_FRAMETYPE_INTRA1:
ctx->buf_switch = 0; ctx->buf_switch = 0;
/* FALLTHROUGH */ /* FALLTHROUGH */
case FRAMETYPE_INTER: case IVI4_FRAMETYPE_INTER:
ctx->dst_buf = ctx->buf_switch; ctx->dst_buf = ctx->buf_switch;
ctx->ref_buf = ctx->buf_switch ^ 1; ctx->ref_buf = ctx->buf_switch ^ 1;
break; break;
case FRAMETYPE_INTER_NOREF: case IVI4_FRAMETYPE_INTER_NOREF:
case FRAMETYPE_NULL_FIRST: case IVI4_FRAMETYPE_NULL_FIRST:
case FRAMETYPE_NULL_LAST: case IVI4_FRAMETYPE_NULL_LAST:
break; break;
} }
} }
@ -650,7 +637,7 @@ static void switch_buffers(IVI45DecContext *ctx)
static int is_nonnull_frame(IVI45DecContext *ctx) static int is_nonnull_frame(IVI45DecContext *ctx)
{ {
return ctx->frame_type < FRAMETYPE_NULL_FIRST; return ctx->frame_type < IVI4_FRAMETYPE_NULL_FIRST;
} }

2
libavcodec/ivi_common.c
View File

@ -1044,7 +1044,7 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
* That's exactly the same Intel decoders do. * That's exactly the same Intel decoders do.
*/ */
if (avctx->codec_id == AV_CODEC_ID_INDEO4 && if (avctx->codec_id == AV_CODEC_ID_INDEO4 &&
ctx->frame_type == 0/*FRAMETYPE_INTRA*/) { ctx->frame_type == IVI4_FRAMETYPE_INTRA) {
// skip version string // skip version string
while (get_bits(&ctx->gb, 8)) { while (get_bits(&ctx->gb, 8)) {
if (get_bits_left(&ctx->gb) < 8) if (get_bits_left(&ctx->gb) < 8)

13
libavcodec/ivi_common.h
View File

@ -33,6 +33,19 @@
#include "get_bits.h" #include "get_bits.h"
#include <stdint.h> #include <stdint.h>
/**
* Indeo 4 frame types.
*/
enum {
IVI4_FRAMETYPE_INTRA = 0,
IVI4_FRAMETYPE_INTRA1 = 1, ///< intra frame with slightly different bitstream coding
IVI4_FRAMETYPE_INTER = 2, ///< non-droppable P-frame
IVI4_FRAMETYPE_BIDIR = 3, ///< bidirectional frame
IVI4_FRAMETYPE_INTER_NOREF = 4, ///< droppable P-frame
IVI4_FRAMETYPE_NULL_FIRST = 5, ///< empty frame with no data
IVI4_FRAMETYPE_NULL_LAST = 6 ///< empty frame with no data
};
#define IVI_VLC_BITS 13 ///< max number of bits of the ivi's huffman codes #define IVI_VLC_BITS 13 ///< max number of bits of the ivi's huffman codes
#define IVI4_STREAM_ANALYSER 0 #define IVI4_STREAM_ANALYSER 0
#define IVI5_IS_PROTECTED 0x20 #define IVI5_IS_PROTECTED 0x20