--- bitstream.h 2002/03/08 02:44:35 1.1 +++ bitstream.h 2003/02/15 15:22:18 1.17 @@ -41,6 +41,9 @@ * * * Revision history: * * * + * 28.06.2002 addded BitstreamNumBitsToByteAlign() * + * BitstreamShowBitsFromByteAlign() * + * 26.03.2002 interlacing support - modified putvol/vopheaders paramters * * 04.03.2002 putbits speedup (Isibaar) * * 03.03.2002 merged BITREADER and BITWRITER (Isibaar) * * 16.12.2001 inital version * @@ -56,36 +59,47 @@ // comment any #defs we dont use +/* start codes */ + #define VIDOBJ_START_CODE 0x00000100 /* ..0x0000011f */ #define VIDOBJLAY_START_CODE 0x00000120 /* ..0x0000012f */ #define VISOBJSEQ_START_CODE 0x000001b0 #define VISOBJSEQ_STOP_CODE 0x000001b1 /* ??? */ #define USERDATA_START_CODE 0x000001b2 #define GRPOFVOP_START_CODE 0x000001b3 -//#define VIDSESERR_ERROR_CODE 0x000001b4 +//#define VIDSESERR_ERROR_CODE 0x000001b4 #define VISOBJ_START_CODE 0x000001b5 -//#define SLICE_START_CODE 0x000001b7 -//#define EXT_START_CODE 0x000001b8 +#define VOP_START_CODE 0x000001b6 +//#define STUFFING_START_CODE 0x000001c3 #define VISOBJ_TYPE_VIDEO 1 -//#define VISOBJ_TYPE_STILLTEXTURE 2 -//#define VISOBJ_TYPE_MESH 3 -//#define VISOBJ_TYPE_FBA 4 -//#define VISOBJ_TYPE_3DMESH 5 +//#define VISOBJ_TYPE_STILLTEXTURE 2 +//#define VISOBJ_TYPE_MESH 3 +//#define VISOBJ_TYPE_FBA 4 +//#define VISOBJ_TYPE_3DMESH 5 #define VIDOBJLAY_TYPE_SIMPLE 1 -//#define VIDOBJLAY_TYPE_SIMPLE_SCALABLE 2 +//#define VIDOBJLAY_TYPE_SIMPLE_SCALABLE 2 #define VIDOBJLAY_TYPE_CORE 3 #define VIDOBJLAY_TYPE_MAIN 4 - - -//#define VIDOBJLAY_AR_SQUARE 1 -//#define VIDOBJLAY_AR_625TYPE_43 2 -//#define VIDOBJLAY_AR_525TYPE_43 3 -//#define VIDOBJLAY_AR_625TYPE_169 8 -//#define VIDOBJLAY_AR_525TYPE_169 9 +//#define VIDOBJLAY_TYPE_NBIT 5 +//#define VIDOBJLAY_TYPE_ANIM_TEXT 6 +//#define VIDOBJLAY_TYPE_ANIM_MESH 7 +//#define VIDOBJLAY_TYPE_SIMPLE_FACE 8 +//#define VIDOBJLAY_TYPE_STILL_SCALABLE 9 +#define VIDOBJLAY_TYPE_ART_SIMPLE 10 +//#define VIDOBJLAY_TYPE_CORE_SCALABLE 11 +#define VIDOBJLAY_TYPE_ACE 12 +//#define VIDOBJLAY_TYPE_SIMPLE_FBA 13 + + +//#define VIDOBJLAY_AR_SQUARE 1 +//#define VIDOBJLAY_AR_625TYPE_43 2 +//#define VIDOBJLAY_AR_525TYPE_43 3 +//#define VIDOBJLAY_AR_625TYPE_169 8 +//#define VIDOBJLAY_AR_525TYPE_169 9 #define VIDOBJLAY_AR_EXTPAR 15 @@ -94,9 +108,12 @@ #define VIDOBJLAY_SHAPE_BINARY_ONLY 2 #define VIDOBJLAY_SHAPE_GRAYSCALE 3 -#define VO_START_CODE 0x8 -#define VOL_START_CODE 0x12 -#define VOP_START_CODE 0x1b6 + +#define SPRITE_NONE 0 +#define SPRITE_STATIC 1 +#define SPRITE_GMC 2 + + #define READ_MARKER() BitstreamSkip(bs, 1) #define WRITE_MARKER() BitstreamPutBit(bs, 1) @@ -109,55 +126,63 @@ #define S_VOP 3 #define N_VOP 4 +// resync-specific +#define NUMBITS_VP_RESYNC_MARKER 17 +#define RESYNC_MARKER 1 -typedef struct -{ - uint32_t bufa; - uint32_t bufb; - uint32_t buf; - uint32_t pos; - uint32_t *tail; - uint32_t *start; - uint32_t length; -} -Bitstream; + +int read_video_packet_header(Bitstream *bs, + DECODER * dec, + const int addbits, + int * quant, + int * fcode_forward, + int * fcode_backward, + int * intra_dc_threshold); // header stuff -int BitstreamReadHeaders(Bitstream * bs, DECODER * dec, uint32_t * rounding, - uint32_t * quant, uint32_t * fcode, uint32_t * intra_dc_threshold); +int BitstreamReadHeaders(Bitstream * bs, + DECODER * dec, + uint32_t * rounding, + uint32_t * reduced_resolution, + uint32_t * quant, + uint32_t * fcode_forward, + uint32_t * fcode_backward, + uint32_t * intra_dc_threshold, + WARPPOINTS * gmc_warp); void BitstreamWriteVolHeader(Bitstream * const bs, - const int width, - const int height, - const int quant_type); - + const MBParam * pParam, + const FRAMEINFO * const frame); void BitstreamWriteVopHeader(Bitstream * const bs, - VOP_TYPE prediction_type, - const int rounding_type, - const uint32_t quant, - const uint32_t fcode); - + const MBParam * pParam, + const FRAMEINFO * const frame, + int vop_coded); + +void BitstreamWriteUserData(Bitstream * const bs, + uint8_t * data, + const int length); /* initialise bitstream structure */ -static void __inline BitstreamInit(Bitstream * const bs, - void * const bitstream, - uint32_t length) +static void __inline +BitstreamInit(Bitstream * const bs, + void *const bitstream, + uint32_t length) { uint32_t tmp; - bs->start = bs->tail = (uint32_t*)bitstream; + bs->start = bs->tail = (uint32_t *) bitstream; - tmp = *(uint32_t *)bitstream; + tmp = *(uint32_t *) bitstream; #ifndef ARCH_IS_BIG_ENDIAN BSWAP(tmp); #endif bs->bufa = tmp; - tmp = *((uint32_t *)bitstream + 1); + tmp = *((uint32_t *) bitstream + 1); #ifndef ARCH_IS_BIG_ENDIAN BSWAP(tmp); #endif @@ -171,7 +196,8 @@ /* reset bitstream state */ -static void __inline BitstreamReset(Bitstream * const bs) +static void __inline +BitstreamReset(Bitstream * const bs) { uint32_t tmp; @@ -190,23 +216,23 @@ bs->bufb = tmp; bs->buf = 0; - bs->pos = 0; + bs->pos = 0; } /* reads n bits from bitstream without changing the stream pos */ -static uint32_t __inline BitstreamShowBits(Bitstream * const bs, - const uint32_t bits) +static uint32_t __inline +BitstreamShowBits(Bitstream * const bs, + const uint32_t bits) { int nbit = (bits + bs->pos) - 32; - if (nbit > 0) - { - return ((bs->bufa & (0xffffffff >> bs->pos)) << nbit) | - (bs->bufb >> (32 - nbit)); - } - else - { + + if (nbit > 0) { + return ((bs->bufa & (0xffffffff >> bs->pos)) << nbit) | (bs-> + bufb >> (32 - + nbit)); + } else { return (bs->bufa & (0xffffffff >> bs->pos)) >> (32 - bs->pos - bits); } } @@ -214,16 +240,17 @@ /* skip n bits forward in bitstream */ -static __inline void BitstreamSkip(Bitstream * const bs, const uint32_t bits) +static __inline void +BitstreamSkip(Bitstream * const bs, + const uint32_t bits) { bs->pos += bits; - if (bs->pos >= 32) - { + if (bs->pos >= 32) { uint32_t tmp; bs->bufa = bs->bufb; - tmp = *((uint32_t *)bs->tail + 2); + tmp = *((uint32_t *) bs->tail + 2); #ifndef ARCH_IS_BIG_ENDIAN BSWAP(tmp); #endif @@ -234,13 +261,44 @@ } +// number of bits to next byte alignment +static __inline uint32_t +BitstreamNumBitsToByteAlign(Bitstream *bs) +{ + uint32_t n = (32 - bs->pos) % 8; + return n == 0 ? 8 : n; +} + + +// show nbits from next byte alignment +static __inline uint32_t +BitstreamShowBitsFromByteAlign(Bitstream *bs, int bits) +{ + int bspos = bs->pos + BitstreamNumBitsToByteAlign(bs); + int nbit = (bits + bspos) - 32; + + if (bspos >= 32) { + return bs->bufb >> (32 - nbit); + } else if (nbit > 0) { + return ((bs->bufa & (0xffffffff >> bspos)) << nbit) | (bs-> + bufb >> (32 - + nbit)); + } else { + return (bs->bufa & (0xffffffff >> bspos)) >> (32 - bspos - bits); + } + +} + + + /* move forward to the next byte boundary */ -static __inline void BitstreamByteAlign(Bitstream * const bs) +static __inline void +BitstreamByteAlign(Bitstream * const bs) { uint32_t remainder = bs->pos % 8; - if (remainder) - { + + if (remainder) { BitstreamSkip(bs, 8 - remainder); } } @@ -248,9 +306,10 @@ /* bitstream length (unit bits) */ -static uint32_t __inline BitstreamPos(const Bitstream * const bs) +static uint32_t __inline +BitstreamPos(const Bitstream * const bs) { - return 8 * ((uint32_t)bs->tail - (uint32_t)bs->start) + bs->pos; + return 8 * ((ptr_t)bs->tail - (ptr_t)bs->start) + bs->pos; } @@ -258,20 +317,21 @@ NOTE: assumes no futher bitstream functions will be called. */ -static uint32_t __inline BitstreamLength(Bitstream * const bs) +static uint32_t __inline +BitstreamLength(Bitstream * const bs) { - uint32_t len = (uint32_t) bs->tail - (uint32_t) bs->start; + uint32_t len = (ptr_t) bs->tail - (ptr_t) bs->start; - if (bs->pos) - { + if (bs->pos) { uint32_t b = bs->buf; + #ifndef ARCH_IS_BIG_ENDIAN BSWAP(b); #endif *bs->tail = b; len += (bs->pos + 7) / 8; - } + } return len; } @@ -279,42 +339,33 @@ /* move bitstream position forward by n bits and write out buffer if needed */ -static void __inline BitstreamForward(Bitstream * const bs, const uint32_t bits) +static void __inline +BitstreamForward(Bitstream * const bs, + const uint32_t bits) { - bs->pos += bits; + bs->pos += bits; - if (bs->pos >= 32) - { + if (bs->pos >= 32) { uint32_t b = bs->buf; + #ifndef ARCH_IS_BIG_ENDIAN BSWAP(b); #endif *bs->tail++ = b; bs->buf = 0; bs->pos -= 32; - } -} - - -/* pad bitstream to the next byte boundary */ - -static void __inline BitstreamPad(Bitstream * const bs) -{ - uint32_t remainder = bs->pos % 8; - - if (remainder) - { - BitstreamForward(bs, 8 - remainder); - } + } } /* read n bits from bitstream */ -static uint32_t __inline BitstreamGetBits(Bitstream * const bs, - const uint32_t n) +static uint32_t __inline +BitstreamGetBits(Bitstream * const bs, + const uint32_t n) { uint32_t ret = BitstreamShowBits(bs, n); + BitstreamSkip(bs, n); return ret; } @@ -322,7 +373,8 @@ /* read single bit from bitstream */ -static uint32_t __inline BitstreamGetBit(Bitstream * const bs) +static uint32_t __inline +BitstreamGetBit(Bitstream * const bs) { return BitstreamGetBits(bs, 1); } @@ -330,21 +382,23 @@ /* write single bit to bitstream */ -static void __inline BitstreamPutBit(Bitstream * const bs, - const uint32_t bit) +static void __inline +BitstreamPutBit(Bitstream * const bs, + const uint32_t bit) { - if (bit) + if (bit) bs->buf |= (0x80000000 >> bs->pos); - BitstreamForward(bs, 1); + BitstreamForward(bs, 1); } /* write n bits to bitstream */ -static void __inline BitstreamPutBits(Bitstream * const bs, - const uint32_t value, - const uint32_t size) +static void __inline +BitstreamPutBits(Bitstream * const bs, + const uint32_t value, + const uint32_t size) { uint32_t shift = 32 - bs->pos - size; @@ -360,10 +414,48 @@ remainder = shift; shift = 32 - shift; - + bs->buf |= value << shift; BitstreamForward(bs, remainder); } } -#endif /* _BITSTREAM_H_ */ + +static const int stuffing_codes[8] = +{ + /* nbits stuffing code */ + 0, /* 1 0 */ + 1, /* 2 01 */ + 3, /* 3 011 */ + 7, /* 4 0111 */ + 0xf, /* 5 01111 */ + 0x1f, /* 6 011111 */ + 0x3f, /* 7 0111111 */ + 0x7f, /* 8 01111111 */ +}; + +/* pad bitstream to the next byte boundary */ + +static void __inline +BitstreamPad(Bitstream * const bs) +{ + int bits = 8 - (bs->pos % 8); + if (bits < 8) + { + BitstreamPutBits(bs, stuffing_codes[bits - 1], bits); + } +} + + +/* pad bitstream to the next byte boundary + alway pad: even if currently at the byte boundary */ + +static void __inline +BitstreamPadAlways(Bitstream * const bs) +{ + int bits = 8 - (bs->pos % 8); + BitstreamPutBits(bs, stuffing_codes[bits - 1], bits); +} + + +#endif /* _BITSTREAM_H_ */