--- trunk/xvidcore/src/bitstream/bitstream.h 2003/02/15 08:39:17 850 +++ trunk/xvidcore/src/bitstream/bitstream.h 2003/02/15 15:22:19 851 @@ -1,58 +1,54 @@ -/***************************************************************************** - * - * XVID MPEG-4 VIDEO CODEC - * - Bitstream reader/writer inlined functions and constants- - * - * Copyright (C) 2001-2002 - Peter Ross - * - * This file is part of XviD, a free MPEG-4 video encoder/decoder - * - * XviD is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Under section 8 of the GNU General Public License, the copyright - * holders of XVID explicitly forbid distribution in the following - * countries: - * - * - Japan - * - United States of America - * - * Linking XviD statically or dynamically with other modules is making a - * combined work based on XviD. Thus, the terms and conditions of the - * GNU General Public License cover the whole combination. - * - * As a special exception, the copyright holders of XviD give you - * permission to link XviD with independent modules that communicate with - * XviD solely through the VFW1.1 and DShow interfaces, regardless of the - * license terms of these independent modules, and to copy and distribute - * the resulting combined work under terms of your choice, provided that - * every copy of the combined work is accompanied by a complete copy of - * the source code of XviD (the version of XviD used to produce the - * combined work), being distributed under the terms of the GNU General - * Public License plus this exception. An independent module is a module - * which is not derived from or based on XviD. - * - * Note that people who make modified versions of XviD are not obligated - * to grant this special exception for their modified versions; it is - * their choice whether to do so. The GNU General Public License gives - * permission to release a modified version without this exception; this - * exception also makes it possible to release a modified version which - * carries forward this exception. - * - * $Id: bitstream.h,v 1.16 2003-02-09 19:32:52 edgomez Exp $ - * - ****************************************************************************/ + /****************************************************************************** + * * + * This file is part of XviD, a free MPEG-4 video encoder/decoder * + * * + * XviD is an implementation of a part of one or more MPEG-4 Video tools * + * as specified in ISO/IEC 14496-2 standard. Those intending to use this * + * software module in hardware or software products are advised that its * + * use may infringe existing patents or copyrights, and any such use * + * would be at such party's own risk. The original developer of this * + * software module and his/her company, and subsequent editors and their * + * companies, will have no liability for use of this software or * + * modifications or derivatives thereof. * + * * + * XviD is free software; you can redistribute it and/or modify it * + * under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * XviD 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the Free Software * + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * * + ******************************************************************************/ + + /****************************************************************************** + * * + * bitstream.h * + * * + * Copyright (C) 2001 - Peter Ross * + * * + * For more information visit the XviD homepage: http://www.xvid.org * + * * + ******************************************************************************/ + + /****************************************************************************** + * * + * 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 * + * * + ******************************************************************************/ #ifndef _BITSTREAM_H_ #define _BITSTREAM_H_ @@ -61,12 +57,9 @@ #include "../decoder.h" #include "../encoder.h" +// comment any #defs we dont use -/***************************************************************************** - * Constants - ****************************************************************************/ - -/* comment any #defs we dont use */ +/* start codes */ #define VIDOBJ_START_CODE 0x00000100 /* ..0x0000011f */ #define VIDOBJLAY_START_CODE 0x00000120 /* ..0x0000012f */ @@ -74,30 +67,39 @@ #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 @@ -106,56 +108,62 @@ #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) -/* vop coding types */ -/* intra, prediction, backward, sprite, not_coded */ +// vop coding types +// intra, prediction, backward, sprite, not_coded #define I_VOP 0 #define P_VOP 1 #define B_VOP 2 #define S_VOP 3 #define N_VOP 4 -/* resync-specific */ +// resync-specific #define NUMBITS_VP_RESYNC_MARKER 17 #define RESYNC_MARKER 1 -/***************************************************************************** - * Prototypes - ****************************************************************************/ +int read_video_packet_header(Bitstream *bs, + DECODER * dec, + const int addbits, + int * quant, + int * fcode_forward, + int * fcode_backward, + int * intra_dc_threshold); -int -read_video_packet_header(Bitstream *bs, const int addbits, int * quant); - -/* header stuff */ +// header stuff 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); + uint32_t * intra_dc_threshold, + WARPPOINTS * gmc_warp); void BitstreamWriteVolHeader(Bitstream * const bs, const MBParam * pParam, - const FRAMEINFO * frame); + const FRAMEINFO * const frame); void BitstreamWriteVopHeader(Bitstream * const bs, const MBParam * pParam, - const FRAMEINFO * frame, + const FRAMEINFO * const frame, int vop_coded); -/***************************************************************************** - * Inlined functions - ****************************************************************************/ +void BitstreamWriteUserData(Bitstream * const bs, + uint8_t * data, + const int length); /* initialise bitstream structure */ @@ -232,7 +240,7 @@ /* skip n bits forward in bitstream */ -static void __inline +static __inline void BitstreamSkip(Bitstream * const bs, const uint32_t bits) { @@ -253,8 +261,8 @@ } -/* number of bits to next byte alignment */ -static uint32_t __inline +// number of bits to next byte alignment +static __inline uint32_t BitstreamNumBitsToByteAlign(Bitstream *bs) { uint32_t n = (32 - bs->pos) % 8; @@ -262,8 +270,8 @@ } -/* show nbits from next byte alignment */ -static uint32_t __inline +// show nbits from next byte alignment +static __inline uint32_t BitstreamShowBitsFromByteAlign(Bitstream *bs, int bits) { int bspos = bs->pos + BitstreamNumBitsToByteAlign(bs); @@ -285,7 +293,7 @@ /* move forward to the next byte boundary */ -static void __inline +static __inline void BitstreamByteAlign(Bitstream * const bs) { uint32_t remainder = bs->pos % 8; @@ -301,7 +309,7 @@ static uint32_t __inline BitstreamPos(const Bitstream * const bs) { - return((uint32_t)(8*((ptr_t)bs->tail - (ptr_t)bs->start) + bs->pos)); + return 8 * ((ptr_t)bs->tail - (ptr_t)bs->start) + bs->pos; } @@ -312,7 +320,7 @@ static uint32_t __inline BitstreamLength(Bitstream * const bs) { - uint32_t len = (uint32_t)((ptr_t)bs->tail - (ptr_t)bs->start); + uint32_t len = (ptr_t) bs->tail - (ptr_t) bs->start; if (bs->pos) { uint32_t b = bs->buf; @@ -350,19 +358,6 @@ } -/* 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 @@ -425,4 +420,42 @@ } } -#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_ */