[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.39.2.14, Sun Jun 29 16:17:51 2003 UTC revision 1.39.2.15, Mon Jul 28 12:29:07 2003 UTC
# Line 1115  Line 1115 
1115          BitstreamPad(bs);          BitstreamPad(bs);
1116          BitstreamPutBits(bs, VISOBJ_START_CODE, 32);          BitstreamPutBits(bs, VISOBJ_START_CODE, 32);
1117          BitstreamPutBits(bs, 0, 1);             /* is_visual_object_identifier */          BitstreamPutBits(bs, 0, 1);             /* is_visual_object_identifier */
1118    
1119            /* Video type */
1120          BitstreamPutBits(bs, VISOBJ_TYPE_VIDEO, 4);             /* visual_object_type */          BitstreamPutBits(bs, VISOBJ_TYPE_VIDEO, 4);             /* visual_object_type */
1121            BitstreamPutBit(bs, 0); /* video_signal_type */
1122    
1123          /* video object_start_code & vo_id */          /* video object_start_code & vo_id */
1124          BitstreamPad(bs);          BitstreamPadAlways(bs); /* next_start_code() */
1125          BitstreamPutBits(bs, VIDOBJ_START_CODE|(vo_id&0x5), 32);          BitstreamPutBits(bs, VIDOBJ_START_CODE|(vo_id&0x5), 32);
1126    
1127          /* video_object_layer_start_code & vol_id */          /* video_object_layer_start_code & vol_id */
# Line 1136  Line 1139 
1139          {          {
1140                  BitstreamPutBit(bs, 1);         /* is_object_layer_identified */                  BitstreamPutBit(bs, 1);         /* is_object_layer_identified */
1141                  BitstreamPutBits(bs, vol_ver_id, 4);    /* vol_ver_id == 2 */                  BitstreamPutBits(bs, vol_ver_id, 4);    /* vol_ver_id == 2 */
1142                  BitstreamPutBits(bs, 4, 3); /* vol_ver_priority (1==lowest, 7==highest) ?? */                  BitstreamPutBits(bs, 4, 3); /* vol_ver_priority (1==highest, 7==lowest) */
1143          }          }
1144    
1145          BitstreamPutBits(bs, 1, 4);     /* aspect_ratio_info (1=1:1) */          BitstreamPutBits(bs, 1, 4);     /* aspect_ratio_info (1=1:1) */
# Line 1239  Line 1242 
1242    
1243          BitstreamPutBit(bs, 0);         /* scalability */          BitstreamPutBit(bs, 0);         /* scalability */
1244    
1245            BitstreamPadAlways(bs); /* next_start_code(); */
1246    
1247          /* fake divx5 id, to ensure compatibility with divx5 decoder */          /* fake divx5 id, to ensure compatibility with divx5 decoder */
1248  #define DIVX5_ID "DivX000b000p"  #define DIVX5_ID "DivX000b000p"
1249          if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED)) {          if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED)) {
# Line 1301  Line 1306 
1306    
1307          if (!vop_coded) {          if (!vop_coded) {
1308                  BitstreamPutBits(bs, 0, 1);                  BitstreamPutBits(bs, 0, 1);
1309    #if 0
1310                    BitstreamPadAlways(bs); /*  next_start_code() */
1311    #endif
1312                    /* NB: It's up to the function caller to write the next_start_code().
1313                     * At the moment encoder.c respects that requisite because a VOP
1314                     * always ends with a next_start_code either if it's coded or not
1315                     * and encoder.c terminates a frame with a next_start_code in whatever
1316                     * case */
1317                  return;                  return;
1318          }          }
1319    

Legend:
Removed from v.1.39.2.14  
changed lines
  Added in v.1.39.2.15

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