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

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

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

revision 676, Mon Nov 25 13:38:56 2002 UTC revision 677, Tue Nov 26 23:44:11 2002 UTC
# Line 50  Line 50 
50   *  exception also makes it possible to release a modified version which   *  exception also makes it possible to release a modified version which
51   *  carries forward this exception.   *  carries forward this exception.
52   *   *
53   * $Id: bitstream.h,v 1.14 2002-11-17 00:57:57 edgomez Exp $   * $Id: bitstream.h,v 1.15 2002-11-26 23:44:10 edgomez Exp $
54   *   *
55   ****************************************************************************/   ****************************************************************************/
56    
# Line 66  Line 66 
66   * Constants   * Constants
67   ****************************************************************************/   ****************************************************************************/
68    
69  // comment any #defs we dont use  /* comment any #defs we dont use */
70    
71  #define VIDOBJ_START_CODE               0x00000100      /* ..0x0000011f  */  #define VIDOBJ_START_CODE               0x00000100      /* ..0x0000011f  */
72  #define VIDOBJLAY_START_CODE    0x00000120      /* ..0x0000012f */  #define VIDOBJLAY_START_CODE    0x00000120      /* ..0x0000012f */
# Line 74  Line 74 
74  #define VISOBJSEQ_STOP_CODE             0x000001b1      /* ??? */  #define VISOBJSEQ_STOP_CODE             0x000001b1      /* ??? */
75  #define USERDATA_START_CODE             0x000001b2  #define USERDATA_START_CODE             0x000001b2
76  #define GRPOFVOP_START_CODE             0x000001b3  #define GRPOFVOP_START_CODE             0x000001b3
77  //#define VIDSESERR_ERROR_CODE  0x000001b4  /*#define VIDSESERR_ERROR_CODE  0x000001b4 */
78  #define VISOBJ_START_CODE               0x000001b5  #define VISOBJ_START_CODE               0x000001b5
79  //#define SLICE_START_CODE      0x000001b7  /*#define SLICE_START_CODE      0x000001b7 */
80  //#define EXT_START_CODE        0x000001b8  /*#define EXT_START_CODE        0x000001b8 */
81    
82    
83  #define VISOBJ_TYPE_VIDEO                               1  #define VISOBJ_TYPE_VIDEO                               1
84  //#define VISOBJ_TYPE_STILLTEXTURE      2  /*#define VISOBJ_TYPE_STILLTEXTURE      2 */
85  //#define VISOBJ_TYPE_MESH              3  /*#define VISOBJ_TYPE_MESH              3 */
86  //#define VISOBJ_TYPE_FBA               4  /*#define VISOBJ_TYPE_FBA               4 */
87  //#define VISOBJ_TYPE_3DMESH            5  /*#define VISOBJ_TYPE_3DMESH            5 */
88    
89    
90  #define VIDOBJLAY_TYPE_SIMPLE                   1  #define VIDOBJLAY_TYPE_SIMPLE                   1
91  //#define VIDOBJLAY_TYPE_SIMPLE_SCALABLE    2  /*#define VIDOBJLAY_TYPE_SIMPLE_SCALABLE    2 */
92  #define VIDOBJLAY_TYPE_CORE                             3  #define VIDOBJLAY_TYPE_CORE                             3
93  #define VIDOBJLAY_TYPE_MAIN                             4  #define VIDOBJLAY_TYPE_MAIN                             4
94    
95    
96  //#define VIDOBJLAY_AR_SQUARE           1  /*#define VIDOBJLAY_AR_SQUARE           1 */
97  //#define VIDOBJLAY_AR_625TYPE_43       2  /*#define VIDOBJLAY_AR_625TYPE_43       2 */
98  //#define VIDOBJLAY_AR_525TYPE_43       3  /*#define VIDOBJLAY_AR_525TYPE_43       3 */
99  //#define VIDOBJLAY_AR_625TYPE_169      8  /*#define VIDOBJLAY_AR_625TYPE_169      8 */
100  //#define VIDOBJLAY_AR_525TYPE_169      9  /*#define VIDOBJLAY_AR_525TYPE_169      9 */
101  #define VIDOBJLAY_AR_EXTPAR                             15  #define VIDOBJLAY_AR_EXTPAR                             15
102    
103    
# Line 113  Line 113 
113  #define READ_MARKER()   BitstreamSkip(bs, 1)  #define READ_MARKER()   BitstreamSkip(bs, 1)
114  #define WRITE_MARKER()  BitstreamPutBit(bs, 1)  #define WRITE_MARKER()  BitstreamPutBit(bs, 1)
115    
116  // vop coding types  /* vop coding types  */
117  // intra, prediction, backward, sprite, not_coded  /* intra, prediction, backward, sprite, not_coded */
118  #define I_VOP   0  #define I_VOP   0
119  #define P_VOP   1  #define P_VOP   1
120  #define B_VOP   2  #define B_VOP   2
121  #define S_VOP   3  #define S_VOP   3
122  #define N_VOP   4  #define N_VOP   4
123    
124  // resync-specific  /* resync-specific */
125  #define NUMBITS_VP_RESYNC_MARKER  17  #define NUMBITS_VP_RESYNC_MARKER  17
126  #define RESYNC_MARKER 1  #define RESYNC_MARKER 1
127    
# Line 134  Line 134 
134  read_video_packet_header(Bitstream *bs, const int addbits, int * quant);  read_video_packet_header(Bitstream *bs, const int addbits, int * quant);
135    
136    
137  // header stuff  /* header stuff */
138  int BitstreamReadHeaders(Bitstream * bs,  int BitstreamReadHeaders(Bitstream * bs,
139                                                   DECODER * dec,                                                   DECODER * dec,
140                                                   uint32_t * rounding,                                                   uint32_t * rounding,
# Line 253  Line 253 
253  }  }
254    
255    
256  // number of bits to next byte alignment  /* number of bits to next byte alignment */
257  static uint32_t __inline  static uint32_t __inline
258  BitstreamNumBitsToByteAlign(Bitstream *bs)  BitstreamNumBitsToByteAlign(Bitstream *bs)
259  {  {
# Line 262  Line 262 
262  }  }
263    
264    
265  // show nbits from next byte alignment  /* show nbits from next byte alignment */
266  static uint32_t __inline  static uint32_t __inline
267  BitstreamShowBitsFromByteAlign(Bitstream *bs, int bits)  BitstreamShowBitsFromByteAlign(Bitstream *bs, int bits)
268  {  {

Legend:
Removed from v.676  
changed lines
  Added in v.677

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