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

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

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

revision 1067, Thu Jun 12 14:16:41 2003 UTC revision 1216, Wed Nov 19 15:42:38 2003 UTC
# Line 20  Line 20 
20   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
21   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
22   *   *
23   * $Id: bitstream.c,v 1.39.2.13 2003-06-12 14:16:41 Isibaar Exp $   * $Id: bitstream.c,v 1.39.2.19 2003-11-19 15:42:38 syskin Exp $
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# 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 1128  Line 1131 
1131          BitstreamPutBit(bs, 0);         /* random_accessible_vol */          BitstreamPutBit(bs, 0);         /* random_accessible_vol */
1132          BitstreamPutBits(bs, vol_type_ind, 8);  /* video_object_type_indication */          BitstreamPutBits(bs, vol_type_ind, 8);  /* video_object_type_indication */
1133    
1134          if (vol_ver_id == 1)          if (vol_ver_id == 1) {
         {  
1135                  BitstreamPutBit(bs, 0);                         /* is_object_layer_identified (0=not given) */                  BitstreamPutBit(bs, 0);                         /* is_object_layer_identified (0=not given) */
1136          }          } else {
         else  
         {  
1137                  BitstreamPutBit(bs, 1);         /* is_object_layer_identified */                  BitstreamPutBit(bs, 1);         /* is_object_layer_identified */
1138                  BitstreamPutBits(bs, vol_ver_id, 4);    /* vol_ver_id == 2 */                  BitstreamPutBits(bs, vol_ver_id, 4);    /* vol_ver_id == 2 */
1139                  BitstreamPutBits(bs, 4, 3); /* vol_ver_priority (1==lowest, 7==highest) ?? */                  BitstreamPutBits(bs, 4, 3); /* vol_ver_priority (1==highest, 7==lowest) */
1140          }          }
1141    
1142          BitstreamPutBits(bs, 1, 4);     /* aspect_ratio_info (1=1:1) */          /* Aspect ratio */
1143            BitstreamPutBits(bs, pParam->par, 4); /* aspect_ratio_info (1=1:1) */
1144            if(pParam->par == XVID_PAR_EXT) {
1145                    BitstreamPutBits(bs, pParam->par_width, 8);
1146                    BitstreamPutBits(bs, pParam->par_height, 8);
1147            }
1148    
1149          BitstreamPutBit(bs, 1); /* vol_control_parameters */          BitstreamPutBit(bs, 1); /* vol_control_parameters */
1150          BitstreamPutBits(bs, 1, 2);     /* chroma_format 1="4:2:0" */          BitstreamPutBits(bs, 1, 2);     /* chroma_format 1="4:2:0" */
# Line 1168  Line 1173 
1173    
1174      if (pParam->fincr>0) {      if (pParam->fincr>0) {
1175              BitstreamPutBit(bs, 1);             /* fixed_vop_rate = 1 */              BitstreamPutBit(bs, 1);             /* fixed_vop_rate = 1 */
1176              BitstreamPutBits(bs, pParam->fincr, log2bin(pParam->fbase));        /* fixed_vop_time_increment */              BitstreamPutBits(bs, pParam->fincr, log2bin(pParam->fbase-1));      /* fixed_vop_time_increment */
1177      }else{      }else{
1178          BitstreamPutBit(bs, 0);         /* fixed_vop_rate = 0 */          BitstreamPutBit(bs, 0);         /* fixed_vop_rate = 0 */
1179      }      }
# Line 1185  Line 1190 
1190          if (vol_ver_id != 1)          if (vol_ver_id != 1)
1191          {       if ((pParam->vol_flags & XVID_VOL_GMC))          {       if ((pParam->vol_flags & XVID_VOL_GMC))
1192                  {       BitstreamPutBits(bs, 2, 2);             /* sprite_enable=='GMC' */                  {       BitstreamPutBits(bs, 2, 2);             /* sprite_enable=='GMC' */
1193                          BitstreamPutBits(bs, 2, 6);             /* no_of_sprite_warping_points */                          BitstreamPutBits(bs, 3, 6);             /* no_of_sprite_warping_points */
1194                          BitstreamPutBits(bs, 3, 2);             /* sprite_warping_accuracy 0==1/2, 1=1/4, 2=1/8, 3=1/16 */                          BitstreamPutBits(bs, 3, 2);             /* sprite_warping_accuracy 0==1/2, 1=1/4, 2=1/8, 3=1/16 */
1195                          BitstreamPutBit(bs, 0);                 /* sprite_brightness_change (not supported) */                          BitstreamPutBit(bs, 0);                 /* sprite_brightness_change (not supported) */
1196    
# Line 1229  Line 1234 
1234          BitstreamPutBit(bs, 1);         /* resync_marker_disable */          BitstreamPutBit(bs, 1);         /* resync_marker_disable */
1235          BitstreamPutBit(bs, 0);         /* data_partitioned */          BitstreamPutBit(bs, 0);         /* data_partitioned */
1236    
1237          if (vol_ver_id != 1)          if (vol_ver_id != 1) {
         {  
1238                  BitstreamPutBit(bs, 0);         /* newpred_enable */                  BitstreamPutBit(bs, 0);         /* newpred_enable */
   
1239                  BitstreamPutBit(bs, (pParam->vol_flags & XVID_VOL_REDUCED_ENABLE)?1:0);                  BitstreamPutBit(bs, (pParam->vol_flags & XVID_VOL_REDUCED_ENABLE)?1:0);
1240                                                                          /* reduced_resolution_vop_enabled */                                                                          /* reduced_resolution_vop_enabled */
1241          }          }
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 1259  Line 1264 
1264                                                  Bitstream * const bs,                                                  Bitstream * const bs,
1265                                                  const MBParam * pParam,                                                  const MBParam * pParam,
1266                                                  const FRAMEINFO * const frame,                                                  const FRAMEINFO * const frame,
1267                                                  int vop_coded)                                                  int vop_coded,
1268                                                    unsigned int quant)
1269  {  {
1270          uint32_t i;          uint32_t i;
1271    
# Line 1288  Line 1294 
1294    
1295          /* time_increment: value=nth_of_sec, nbits = log2(resolution) */          /* time_increment: value=nth_of_sec, nbits = log2(resolution) */
1296    
1297          BitstreamPutBits(bs, frame->ticks, log2bin(pParam->fbase));          BitstreamPutBits(bs, frame->ticks, log2bin(pParam->fbase-1));
1298  #if 0  #if 0
1299          DPRINTF("[%i:%i] %c",          DPRINTF("[%i:%i] %c",
1300                          frame->seconds, frame->ticks,                          frame->seconds, frame->ticks,
# Line 1301  Line 1307 
1307    
1308          if (!vop_coded) {          if (!vop_coded) {
1309                  BitstreamPutBits(bs, 0, 1);                  BitstreamPutBits(bs, 0, 1);
1310    #if 0
1311                    BitstreamPadAlways(bs); /*  next_start_code() */
1312    #endif
1313                    /* NB: It's up to the function caller to write the next_start_code().
1314                     * At the moment encoder.c respects that requisite because a VOP
1315                     * always ends with a next_start_code either if it's coded or not
1316                     * and encoder.c terminates a frame with a next_start_code in whatever
1317                     * case */
1318                  return;                  return;
1319          }          }
1320    
# Line 1322  Line 1336 
1336          if (frame->coding_type == S_VOP) {          if (frame->coding_type == S_VOP) {
1337                  if (1)  {               /* no_of_sprite_warping_points>=1 (we use 2!) */                  if (1)  {               /* no_of_sprite_warping_points>=1 (we use 2!) */
1338                          int k;                          int k;
1339                          for (k=0;k<2;k++)                          for (k=0;k<3;k++)
1340                          {                          {
1341                                  bs_put_spritetrajectory(bs, frame->warp.duv[k].x ); /* du[k]  */                                  bs_put_spritetrajectory(bs, frame->warp.duv[k].x ); /* du[k]  */
1342                                  WRITE_MARKER();                                  WRITE_MARKER();
# Line 1344  Line 1358 
1358    
1359    
1360  #if 0  #if 0
1361          DPRINTF(XVID_DEBUG_HEADER, "quant = %i\n", frame->quant);          DPRINTF(XVID_DEBUG_HEADER, "quant = %i\n", quant);
1362  #endif  #endif
1363    
1364          BitstreamPutBits(bs, frame->quant, 5);  /* quantizer */          BitstreamPutBits(bs, quant, 5); /* quantizer */
1365    
1366          if (frame->coding_type != I_VOP)          if (frame->coding_type != I_VOP)
1367                  BitstreamPutBits(bs, frame->fcode, 3);  /* forward_fixed_code */                  BitstreamPutBits(bs, frame->fcode, 3);  /* forward_fixed_code */
Legend:
Removed from v.1067  
changed lines
  Added in v.1216
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4