[cvs] / xvidcore / src / bitstream / bitstream.h Repository:
ViewVC logotype

Diff of /xvidcore/src/bitstream/bitstream.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.16.2.2, Mon Jul 28 12:39:32 2003 UTC revision 1.17.2.4, Mon May 12 12:31:05 2003 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - Bitstream reader/writer inlined functions and constants-   *  - Bitstream reader/writer inlined functions and constants-
5   *   *
6   *  Copyright (C) 2001-2002 - Peter Ross <pross@xvid.org>   *  Copyright (C) 2001-2003 - Peter Ross <pross@xvid.org>
7   *   *
8   *  This file is part of XviD, a free MPEG-4 video encoder/decoder   *  This file is part of XviD, a free MPEG-4 video encoder/decoder
9   *   *
# Line 21  Line 21 
21   *  along with this program; if not, write to the Free Software   *  along with this program; if not, write to the Free Software
22   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
23   *   *
  *  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.  
  *  
24   * $Id$   * $Id$
25   *   *
26   ****************************************************************************/   ****************************************************************************/
# Line 57  Line 28 
28  #ifndef _BITSTREAM_H_  #ifndef _BITSTREAM_H_
29  #define _BITSTREAM_H_  #define _BITSTREAM_H_
30    
 #include <stdio.h>  
   
31  #include "../portab.h"  #include "../portab.h"
32  #include "../decoder.h"  #include "../decoder.h"
33  #include "../encoder.h"  #include "../encoder.h"
# Line 78  Line 47 
47  #define GRPOFVOP_START_CODE             0x000001b3  #define GRPOFVOP_START_CODE             0x000001b3
48  /*#define VIDSESERR_ERROR_CODE  0x000001b4 */  /*#define VIDSESERR_ERROR_CODE  0x000001b4 */
49  #define VISOBJ_START_CODE               0x000001b5  #define VISOBJ_START_CODE               0x000001b5
50  /*#define SLICE_START_CODE      0x000001b7 */  #define VOP_START_CODE                  0x000001b6
51  /*#define EXT_START_CODE        0x000001b8 */  /*#define STUFFING_START_CODE   0x000001c3 */
52    
53    
54  #define VISOBJ_TYPE_VIDEO                               1  #define VISOBJ_TYPE_VIDEO                               1
# Line 91  Line 60 
60    
61  #define VIDOBJLAY_TYPE_SIMPLE                   1  #define VIDOBJLAY_TYPE_SIMPLE                   1
62  /*#define VIDOBJLAY_TYPE_SIMPLE_SCALABLE    2 */  /*#define VIDOBJLAY_TYPE_SIMPLE_SCALABLE    2 */
63  #define VIDOBJLAY_TYPE_CORE                             3  /*#define VIDOBJLAY_TYPE_CORE                           3 */
64  #define VIDOBJLAY_TYPE_MAIN                             4  /*#define VIDOBJLAY_TYPE_MAIN                           4 */
65    /*#define VIDOBJLAY_TYPE_NBIT                           5 */
66    /*#define VIDOBJLAY_TYPE_ANIM_TEXT                      6 */
67    /*#define VIDOBJLAY_TYPE_ANIM_MESH                      7 */
68    /*#define VIDOBJLAY_TYPE_SIMPLE_FACE            8 */
69    /*#define VIDOBJLAY_TYPE_STILL_SCALABLE         9 */
70    #define VIDOBJLAY_TYPE_ART_SIMPLE               10
71    /*#define VIDOBJLAY_TYPE_CORE_SCALABLE          11 */
72    /*#define VIDOBJLAY_TYPE_ACE                            12 */
73    /*#define VIDOBJLAY_TYPE_ADVANCED_SCALABLE_TEXTURE 13 */
74    /*#define VIDOBJLAY_TYPE_SIMPLE_FBA                     14 */
75    /*#define VIDEOJLAY_TYPE_SIMPLE_STUDIO    15*/
76    /*#define VIDEOJLAY_TYPE_CORE_STUDIO      16*/
77    #define VIDOBJLAY_TYPE_ASP              17
78    /*#define VIDOBJLAY_TYPE_FGS              18*/
79    
80    
81  /*#define VIDOBJLAY_AR_SQUARE           1 */  /*#define VIDOBJLAY_AR_SQUARE           1 */
# Line 108  Line 91 
91  #define VIDOBJLAY_SHAPE_BINARY_ONLY             2  #define VIDOBJLAY_SHAPE_BINARY_ONLY             2
92  #define VIDOBJLAY_SHAPE_GRAYSCALE               3  #define VIDOBJLAY_SHAPE_GRAYSCALE               3
93    
94  #define VO_START_CODE   0x8  
95  #define VOL_START_CODE  0x12  #define SPRITE_NONE             0
96  #define VOP_START_CODE  0x1b6  #define SPRITE_STATIC   1
97    #define SPRITE_GMC              2
98    
99    
100    
101  #define READ_MARKER()   BitstreamSkip(bs, 1)  #define READ_MARKER()   BitstreamSkip(bs, 1)
102  #define WRITE_MARKER()  BitstreamPutBit(bs, 1)  #define WRITE_MARKER()  BitstreamPutBit(bs, 1)
# Line 132  Line 118 
118   * Prototypes   * Prototypes
119   ****************************************************************************/   ****************************************************************************/
120    
121  int  int read_video_packet_header(Bitstream *bs,
122  read_video_packet_header(Bitstream *bs, const int addbits, int * quant);                                                           DECODER * dec,
123                                                             const int addbits,
124                                                             int *quant,
125                                                             int *fcode_forward,
126                                                             int *fcode_backward,
127                                                             int *intra_dc_threshold);
128    
129  /* header stuff */  /* header stuff */
130  int BitstreamReadHeaders(Bitstream * bs,  int BitstreamReadHeaders(Bitstream * bs,
131                                                   DECODER * dec,                                                   DECODER * dec,
132                                                   uint32_t * rounding,                                                   uint32_t * rounding,
133                                                     uint32_t * reduced_resolution,
134                                                   uint32_t * quant,                                                   uint32_t * quant,
135                                                   uint32_t * fcode_forward,                                                   uint32_t * fcode_forward,
136                                                   uint32_t * fcode_backward,                                                   uint32_t * fcode_backward,
137                                                   uint32_t * intra_dc_threshold);                                                   uint32_t * intra_dc_threshold,
138                                                     WARPPOINTS * gmc_warp);
139    
140    
141  void BitstreamWriteVolHeader(Bitstream * const bs,  void BitstreamWriteVolHeader(Bitstream * const bs,
142                                                           const MBParam * pParam,                                                           const MBParam * pParam);
                                                          const FRAMEINFO * frame);  
143    
144  void BitstreamWriteVopHeader(Bitstream * const bs,  void BitstreamWriteVopHeader(Bitstream * const bs,
145                                                           const MBParam * pParam,                                                           const MBParam * pParam,
146                                                           const FRAMEINFO * frame,                                                           const FRAMEINFO * const frame,
147                                                           int vop_coded);                                                           int vop_coded);
148    
149  /*****************************************************************************  void BitstreamWriteUserData(Bitstream * const bs,
150   * Inlined functions                                                          uint8_t * data,
151   ****************************************************************************/                                                          const int length);
152    
153  /* initialise bitstream structure */  /* initialise bitstream structure */
154    
# Line 242  Line 233 
233    
234  /* skip n bits forward in bitstream */  /* skip n bits forward in bitstream */
235    
236  static void __inline  static __inline void
237  BitstreamSkip(Bitstream * const bs,  BitstreamSkip(Bitstream * const bs,
238                            const uint32_t bits)                            const uint32_t bits)
239  {  {
# Line 264  Line 255 
255    
256    
257  /* number of bits to next byte alignment */  /* number of bits to next byte alignment */
258  static uint32_t __inline  static __inline uint32_t
259  BitstreamNumBitsToByteAlign(Bitstream *bs)  BitstreamNumBitsToByteAlign(Bitstream *bs)
260  {  {
261          uint32_t n = (32 - bs->pos) % 8;          uint32_t n = (32 - bs->pos) % 8;
# Line 273  Line 264 
264    
265    
266  /* show nbits from next byte alignment */  /* show nbits from next byte alignment */
267  static uint32_t __inline  static __inline uint32_t
268  BitstreamShowBitsFromByteAlign(Bitstream *bs, int bits)  BitstreamShowBitsFromByteAlign(Bitstream *bs, int bits)
269  {  {
270          int bspos = bs->pos + BitstreamNumBitsToByteAlign(bs);          int bspos = bs->pos + BitstreamNumBitsToByteAlign(bs);
# Line 295  Line 286 
286    
287  /* move forward to the next byte boundary */  /* move forward to the next byte boundary */
288    
289  static void __inline  static __inline void
290  BitstreamByteAlign(Bitstream * const bs)  BitstreamByteAlign(Bitstream * const bs)
291  {  {
292          uint32_t remainder = bs->pos % 8;          uint32_t remainder = bs->pos % 8;
# Line 315  Line 306 
306  }  }
307    
308    
309  /*      flush the bitstream & return length (unit bytes)  /*
310          NOTE: assumes no futher bitstream functions will be called.   * flush the bitstream & return length (unit bytes)
311     * NOTE: assumes no futher bitstream functions will be called.
312   */   */
313    
314  static uint32_t __inline  static uint32_t __inline
# Line 448  Line 440 
440                  BitstreamPutBits(bs, stuffing_codes[bits - 1], bits);                  BitstreamPutBits(bs, stuffing_codes[bits - 1], bits);
441  }  }
442    
443    
444  /*  /*
445   * pad bitstream to the next byte boundary   * pad bitstream to the next byte boundary
446   * alway pad: even if currently at the byte boundary   * alway pad: even if currently at the byte boundary

Legend:
Removed from v.1.16.2.2  
changed lines
  Added in v.1.17.2.4

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4