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

Diff of /xvidcore/src/bitstream/bitstream.c

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

revision 1.53, Mon Aug 1 10:53:46 2005 UTC revision 1.54, Thu Oct 6 10:46:42 2005 UTC
# Line 1076  Line 1076 
1076          int vol_profile = pParam->profile;          int vol_profile = pParam->profile;
1077    
1078          if ( (pParam->vol_flags & XVID_VOL_QUARTERPEL) ||          if ( (pParam->vol_flags & XVID_VOL_QUARTERPEL) ||
1079           (pParam->vol_flags & XVID_VOL_GMC) ||           (pParam->vol_flags & XVID_VOL_GMC))
                  (pParam->vol_flags & XVID_VOL_REDUCED_ENABLE))  
1080                  vol_ver_id = 2;                  vol_ver_id = 2;
1081    
     if ((pParam->vol_flags & XVID_VOL_REDUCED_ENABLE)) {  
         vol_type_ind = VIDOBJLAY_TYPE_ART_SIMPLE;  
     }  
   
1082      if ((pParam->vol_flags & (XVID_VOL_MPEGQUANT|XVID_VOL_QUARTERPEL|XVID_VOL_GMC|XVID_VOL_INTERLACING)) ||      if ((pParam->vol_flags & (XVID_VOL_MPEGQUANT|XVID_VOL_QUARTERPEL|XVID_VOL_GMC|XVID_VOL_INTERLACING)) ||
1083           pParam->max_bframes>0) {           pParam->max_bframes>0) {
1084          vol_type_ind = VIDOBJLAY_TYPE_ASP;          vol_type_ind = VIDOBJLAY_TYPE_ASP;
# Line 1242  Line 1237 
1237    
1238          if (vol_ver_id != 1) {          if (vol_ver_id != 1) {
1239                  BitstreamPutBit(bs, 0);         /* newpred_enable */                  BitstreamPutBit(bs, 0);         /* newpred_enable */
1240                  BitstreamPutBit(bs, (pParam->vol_flags & XVID_VOL_REDUCED_ENABLE)?1:0);                  BitstreamPutBit(bs, 0);         /* reduced_resolution_vop_enabled */
                                                                         /* reduced_resolution_vop_enabled */  
1241          }          }
1242    
1243          BitstreamPutBit(bs, 0);         /* scalability */          BitstreamPutBit(bs, 0);         /* scalability */
# Line 1337  Line 1331 
1331          if ( (frame->coding_type == P_VOP) || (frame->coding_type == S_VOP) )          if ( (frame->coding_type == P_VOP) || (frame->coding_type == S_VOP) )
1332                  BitstreamPutBits(bs, frame->rounding_type, 1);                  BitstreamPutBits(bs, frame->rounding_type, 1);
1333    
         if ((frame->vol_flags & XVID_VOL_REDUCED_ENABLE))  
                 BitstreamPutBit(bs, 0);  
   
1334          BitstreamPutBits(bs, 0, 3);     /* intra_dc_vlc_threshold */          BitstreamPutBits(bs, 0, 3);     /* intra_dc_vlc_threshold */
1335    
1336          if ((frame->vol_flags & XVID_VOL_INTERLACING)) {          if ((frame->vol_flags & XVID_VOL_INTERLACING)) {

Legend:
Removed from v.1.53  
changed lines
  Added in v.1.54

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