X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fivi_common.h;h=e2cc593b61a33eef5ad2b130c61ad9f93e184ce2;hb=6cf7f30655e95e27fd0394b5a80970d6f9517015;hp=7c6d1314de8edce696f052a653929da051ec7f59;hpb=e4cbf7529ba4bcfff47c44b0d026ecb356004c8c;p=ffmpeg diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h index 7c6d1314de8..e2cc593b61a 100644 --- a/libavcodec/ivi_common.h +++ b/libavcodec/ivi_common.h @@ -33,6 +33,19 @@ #include "get_bits.h" #include +/** + * 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 IVI4_STREAM_ANALYSER 0 #define IVI5_IS_PROTECTED 0x20 @@ -63,9 +76,6 @@ enum { IVI_BLK_HUFF = 1 /// Huffman table is used for coding blocks }; -extern VLC ff_ivi_mb_vlc_tabs [8]; ///< static macroblock Huffman tables -extern VLC ff_ivi_blk_vlc_tabs[8]; ///< static block Huffman tables - /** * Common scan patterns (defined in ivi_common.c) @@ -107,6 +117,8 @@ typedef struct IVIMbInfo { int8_t q_delta; ///< quant delta int8_t mv_x; ///< motion vector (x component) int8_t mv_y; ///< motion vector (y component) + int8_t b_mv_x; ///< second motion vector (x component) + int8_t b_mv_y; ///< second motion vector (y component) } IVIMbInfo; @@ -140,7 +152,8 @@ typedef struct IVIBandDesc { int data_size; ///< size of the band data int16_t *buf; ///< pointer to the output buffer for this band int16_t *ref_buf; ///< pointer to the reference frame buffer (for motion compensation) - int16_t *bufs[3]; ///< array of pointers to the band buffers + int16_t *b_ref_buf; ///< pointer to the second reference frame buffer (for motion compensation) + int16_t *bufs[4]; ///< array of pointers to the band buffers int pitch; ///< pitch associated with the buffers above int is_empty; ///< = 1 if this band doesn't contain any data int mb_size; ///< macroblock size @@ -162,6 +175,7 @@ typedef struct IVIBandDesc { int num_tiles; ///< number of tiles in this band IVITile *tiles; ///< array of tile descriptors InvTransformPtr *inv_transform; + int transform_size; DCTransformPtr *dc_transform; int is_2d_trans; ///< 1 indicates that the two-dimensional inverse transform is used int32_t checksum; ///< for debug purposes @@ -198,7 +212,6 @@ typedef struct IVIPicConfig { typedef struct IVI45DecContext { GetBitContext gb; - AVFrame frame; RVMapDesc rvmap_tabs[9]; ///< local corrected copy of the static rvmap tables uint32_t frame_num; @@ -221,6 +234,7 @@ typedef struct IVI45DecContext { int dst_buf; ///< buffer index for the currently decoded frame int ref_buf; ///< inter frame reference buffer index int ref2_buf; ///< temporal storage for switching buffers + int b_ref_buf; ///< second reference frame buffer index IVIHuffTab mb_vlc; ///< current macroblock table descriptor IVIHuffTab blk_vlc; ///< current block table descriptor @@ -250,6 +264,11 @@ typedef struct IVI45DecContext { int (*is_nonnull_frame)(struct IVI45DecContext *ctx); int gop_invalid; + + int is_indeo4; + + AVFrame *p_frame; + int got_p_frame; } IVI45DecContext; /** compare some properties of two pictures */ @@ -277,17 +296,6 @@ static inline int ivi_scale_mv(int mv, int mv_scale) return (mv + (mv > 0) + (mv_scale - 1)) >> mv_scale; } -/** - * Generate a huffman codebook from the given descriptor - * and convert it into the Libav VLC table. - * - * @param[in] cb pointer to codebook descriptor - * @param[out] vlc where to place the generated VLC table - * @param[in] flag flag: 1 - for static or 0 for dynamic tables - * @return result code: 0 - OK, -1 = error (invalid codebook descriptor) - */ -int ff_ivi_create_huff_from_desc(const IVIHuffDesc *cb, VLC *vlc, int flag); - /** * Initialize static codes used for macroblock and block decoding. */ @@ -307,38 +315,16 @@ void ff_ivi_init_static_vlc(void); int ff_ivi_dec_huff_desc(GetBitContext *gb, int desc_coded, int which_tab, IVIHuffTab *huff_tab, AVCodecContext *avctx); -/** - * Compare two huffman codebook descriptors. - * - * @param[in] desc1 ptr to the 1st descriptor to compare - * @param[in] desc2 ptr to the 2nd descriptor to compare - * @return comparison result: 0 - equal, 1 - not equal - */ -int ff_ivi_huff_desc_cmp(const IVIHuffDesc *desc1, const IVIHuffDesc *desc2); - -/** - * Copy huffman codebook descriptors. - * - * @param[out] dst ptr to the destination descriptor - * @param[in] src ptr to the source descriptor - */ -void ff_ivi_huff_desc_copy(IVIHuffDesc *dst, const IVIHuffDesc *src); - /** * Initialize planes (prepares descriptors, allocates buffers etc). * - * @param[in,out] planes pointer to the array of the plane descriptors - * @param[in] cfg pointer to the ivi_pic_config structure describing picture layout + * @param[in,out] planes pointer to the array of the plane descriptors + * @param[in] cfg pointer to the ivi_pic_config structure describing picture layout + * @param[in] is_indeo4 flag signalling if it is Indeo 4 or not * @return result code: 0 - OK */ -int ff_ivi_init_planes(IVIPlaneDesc *planes, const IVIPicConfig *cfg); - -/** - * Free planes, bands and macroblocks buffers. - * - * @param[in] planes pointer to the array of the plane descriptors - */ -void ff_ivi_free_buffers(IVIPlaneDesc *planes); +int ff_ivi_init_planes(IVIPlaneDesc *planes, const IVIPicConfig *cfg, + int is_indeo4); /** * Initialize tile and macroblock descriptors. @@ -350,44 +336,8 @@ void ff_ivi_free_buffers(IVIPlaneDesc *planes); */ int ff_ivi_init_tiles(IVIPlaneDesc *planes, int tile_width, int tile_height); -/** - * Decode size of the tile data. - * The size is stored as a variable-length field having the following format: - * if (tile_data_size < 255) than this field is only one byte long - * if (tile_data_size >= 255) than this field four is byte long: 0xFF X1 X2 X3 - * where X1-X3 is size of the tile data - * - * @param[in,out] gb the GetBit context - * @return size of the tile data in bytes - */ -int ff_ivi_dec_tile_data_size(GetBitContext *gb); - -/** - * Decode block data: - * extract huffman-coded transform coefficients from the bitstream, - * dequantize them, apply inverse transform and motion compensation - * in order to reconstruct the picture. - * - * @param[in,out] gb the GetBit context - * @param[in] band pointer to the band descriptor - * @param[in] tile pointer to the tile descriptor - * @return result code: 0 - OK, -1 = error (corrupted blocks data) - */ -int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile); - -/** - * Convert and output the current plane. - * This conversion is done by adding back the bias value of 128 - * (subtracted in the encoder) and clipping the result. - * - * @param[in] plane pointer to the descriptor of the plane being processed - * @param[out] dst pointer to the buffer receiving converted pixels - * @param[in] dst_pitch pitch for moving to the next y line - */ -void ff_ivi_output_plane(IVIPlaneDesc *plane, uint8_t *dst, int dst_pitch); - -int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *data_size, +int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt); -av_cold int ff_ivi_decode_close(AVCodecContext *avctx); +int ff_ivi_decode_close(AVCodecContext *avctx); #endif /* AVCODEC_IVI_COMMON_H */