[svn] / branches / dev-api-3 / xvidcore / src / bitstream / bitstream.c Repository:
ViewVC logotype

Diff of /branches/dev-api-3/xvidcore/src/bitstream/bitstream.c

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

revision 707, Thu Dec 12 10:38:28 2002 UTC revision 733, Fri Dec 20 05:12:02 2002 UTC
# Line 67  Line 67 
67    
68    
69  #include <string.h>  #include <string.h>
70    #include <stdio.h>
71    
72  #include "bitstream.h"  #include "bitstream.h"
73  #include "zigzag.h"  #include "zigzag.h"
74  #include "../quant/quant_matrix.h"  #include "../quant/quant_matrix.h"
# Line 171  Line 173 
173    
174          if (dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY)          if (dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY)
175          {          {
176                  *quant = BitstreamGetBits(bs, 5);       /* quant_scale */                  *quant = BitstreamGetBits(bs, dec->quant_bits); /* quant_scale */
177                  DPRINTF(DPRINTF_HEADER, "quant %i", *quant);                  DPRINTF(DPRINTF_HEADER, "quant %i", *quant);
178          }          }
179    
# Line 324  Line 326 
326  {  {
327          ESTIMATION * e = &dec->estimation;          ESTIMATION * e = &dec->estimation;
328    
329          if (e->method == 0)          if (e->method == 0 || e->method == 1)
330          {          {
331                  if (coding_type == I_VOP) {                  if (coding_type == I_VOP) {
332                          if (e->opaque)          BitstreamSkip(bs, 8);   /* dcecs_opaque */                          if (e->opaque)          BitstreamSkip(bs, 8);   /* dcecs_opaque */
# Line 1112  Line 1114 
1114                                                  const MBParam * pParam,                                                  const MBParam * pParam,
1115                                                  const FRAMEINFO * const frame)                                                  const FRAMEINFO * const frame)
1116  {  {
1117            static const unsigned int vo_id = 0;
1118            static const unsigned int vol_id = 0;
1119          int vol_ver_id=1;          int vol_ver_id=1;
1120    
1121          if ( pParam->m_quarterpel ||  (frame->global_flags & XVID_GMC) ||          if ( pParam->m_quarterpel ||  (frame->global_flags & XVID_GMC) ||
# Line 1120  Line 1124 
1124    
1125          // video object_start_code & vo_id          // video object_start_code & vo_id
1126          BitstreamPad(bs);          BitstreamPad(bs);
1127          BitstreamPutBits(bs, VO_START_CODE, 27);          BitstreamPutBits(bs, VIDOBJ_START_CODE|(vo_id&0x5), 32);
         BitstreamPutBits(bs, 0, 5);  
1128    
1129          // video_object_layer_start_code & vol_id          // video_object_layer_start_code & vol_id
1130          BitstreamPutBits(bs, VOL_START_CODE, 28);          BitstreamPutBits(bs, VIDOBJLAY_START_CODE|(vol_id&0x4), 32);
         BitstreamPutBits(bs, 0, 4);  
1131    
1132          BitstreamPutBit(bs, 0);         // random_accessible_vol          BitstreamPutBit(bs, 0);         // random_accessible_vol
1133          BitstreamPutBits(bs, 0, 8);     // video_object_type_indication          BitstreamPutBits(bs, 0, 8);     // video_object_type_indication
Legend:
Removed from v.707  
changed lines
  Added in v.733
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4