[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 1058, Mon Jun 9 19:42:25 2003 UTC revision 1097, Mon Jul 28 12:29:07 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.12 2003-06-09 19:42:18 edgomez Exp $   * $Id: bitstream.c,v 1.39.2.15 2003-07-28 12:29:07 edgomez Exp $
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 36  Line 36 
36  static uint32_t __inline  static uint32_t __inline
37  log2bin(uint32_t value)  log2bin(uint32_t value)
38  {  {
 /* Changed by Chenm001 */  
 #if !defined(_MSC_VER)  
39          int n = 0;          int n = 0;
40    
41          while (value) {          while (value) {
# Line 45  Line 43 
43                  n++;                  n++;
44          }          }
45          return n;          return n;
 #else  
         __asm {  
                 bsr eax, value  
                 inc eax  
         }  
 #endif  
46  }  }
47    
48    
# Line 1123  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 1144  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 1193  Line 1188 
1188          if (vol_ver_id != 1)          if (vol_ver_id != 1)
1189          {       if ((pParam->vol_flags & XVID_VOL_GMC))          {       if ((pParam->vol_flags & XVID_VOL_GMC))
1190                  {       BitstreamPutBits(bs, 2, 2);             /* sprite_enable=='GMC' */                  {       BitstreamPutBits(bs, 2, 2);             /* sprite_enable=='GMC' */
1191                          BitstreamPutBits(bs, 2, 6);             /* no_of_sprite_warping_points */                          BitstreamPutBits(bs, 3, 6);             /* no_of_sprite_warping_points */
1192                          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 */
1193                          BitstreamPutBit(bs, 0);                 /* sprite_brightness_change (not supported) */                          BitstreamPutBit(bs, 0);                 /* sprite_brightness_change (not supported) */
1194    
# Line 1247  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 1309  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    
# Line 1330  Line 1335 
1335          if (frame->coding_type == S_VOP) {          if (frame->coding_type == S_VOP) {
1336                  if (1)  {               /* no_of_sprite_warping_points>=1 (we use 2!) */                  if (1)  {               /* no_of_sprite_warping_points>=1 (we use 2!) */
1337                          int k;                          int k;
1338                          for (k=0;k<2;k++)                          for (k=0;k<3;k++)
1339                          {                          {
1340                                  bs_put_spritetrajectory(bs, frame->warp.duv[k].x ); /* du[k]  */                                  bs_put_spritetrajectory(bs, frame->warp.duv[k].x ); /* du[k]  */
1341                                  WRITE_MARKER();                                  WRITE_MARKER();
Legend:
Removed from v.1058  
changed lines
  Added in v.1097
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4