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

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

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

revision 1616, Tue May 17 21:03:32 2005 UTC revision 1653, Tue Nov 22 10:23:01 2005 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.51 2005-05-17 21:03:32 Skal Exp $   * $Id: bitstream.c,v 1.55 2005-11-22 10:23:01 suxen_drol Exp $
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 33  Line 33 
33  #include "mbcoding.h"  #include "mbcoding.h"
34    
35    
36  static const uint8_t log2_tab_16[256] =  { 0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4 };  static const uint8_t log2_tab_16[16] =  { 0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4 };
37    
38  static uint32_t __inline log2bin(uint32_t value)  static uint32_t __inline log2bin(uint32_t value)
39  {  {
# Line 65  Line 65 
65  };  };
66    
67    
68  void  static void
69  bs_get_matrix(Bitstream * bs,  bs_get_matrix(Bitstream * bs,
70                            uint8_t * matrix)                            uint8_t * matrix)
71  {  {
# Line 194  Line 194 
194                                  DPRINTF(XVID_DEBUG_HEADER,"fcode_backward %i\n", *fcode_backward);                                  DPRINTF(XVID_DEBUG_HEADER,"fcode_backward %i\n", *fcode_backward);
195                          }                          }
196                  }                  }
   
197          }          }
198    
199          if (dec->newpred_enable)          if (dec->newpred_enable)
# Line 550  Line 549 
549                          dec->time_inc_resolution = BitstreamGetBits(bs, 16);    /* vop_time_increment_resolution */                          dec->time_inc_resolution = BitstreamGetBits(bs, 16);    /* vop_time_increment_resolution */
550                          DPRINTF(XVID_DEBUG_HEADER,"vop_time_increment_resolution %i\n", dec->time_inc_resolution);                          DPRINTF(XVID_DEBUG_HEADER,"vop_time_increment_resolution %i\n", dec->time_inc_resolution);
551    
 #if 0  
                         dec->time_inc_resolution--;  
 #endif  
   
552                          if (dec->time_inc_resolution > 0) {                          if (dec->time_inc_resolution > 0) {
553                                  dec->time_inc_bits = MAX(log2bin(dec->time_inc_resolution-1), 1);                                  dec->time_inc_bits = MAX(log2bin(dec->time_inc_resolution-1), 1);
554                          } else {                          } else {
 #if 0  
                                 dec->time_inc_bits = 0;  
 #endif  
555                                  /* for "old" xvid compatibility, set time_inc_bits = 1 */                                  /* for "old" xvid compatibility, set time_inc_bits = 1 */
556                                  dec->time_inc_bits = 1;                                  dec->time_inc_bits = 1;
557                          }                          }
# Line 1084  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 1250  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 1259  Line 1245 
1245          BitstreamPadAlways(bs); /* next_start_code(); */          BitstreamPadAlways(bs); /* next_start_code(); */
1246    
1247          /* divx5 userdata string */          /* divx5 userdata string */
1248  #define DIVX5_ID "DivX503b1393"  #define DIVX5_ID ((char *)"DivX503b1393")
1249    if ((pParam->global_flags & XVID_GLOBAL_DIVX5_USERDATA)) {    if ((pParam->global_flags & XVID_GLOBAL_DIVX5_USERDATA)) {
1250      BitstreamWriteUserData(bs, DIVX5_ID, strlen(DIVX5_ID));      BitstreamWriteUserData(bs, DIVX5_ID, strlen(DIVX5_ID));
1251          if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED))          if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED))
# Line 1345  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)) {
# Line 1395  Line 1378 
1378    
1379  void  void
1380  BitstreamWriteUserData(Bitstream * const bs,  BitstreamWriteUserData(Bitstream * const bs,
1381                                                  uint8_t * data,                                                  const char *data,
1382                                                  const int length)                                                  const unsigned int length)
1383  {  {
1384          int i;          int i;
1385    
# Line 1455  Line 1438 
1438  {  {
1439      const int mbnum_bits = log2bin(pParam->mb_width *  pParam->mb_height - 1);      const int mbnum_bits = log2bin(pParam->mb_width *  pParam->mb_height - 1);
1440      uint32_t nbitsresyncmarker;      uint32_t nbitsresyncmarker;
1441      int addbits=0;  
1442      if (frame->coding_type != I_VOP)      if (frame->coding_type == I_VOP)
1443          addbits = frame->fcode -1;        nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER;  /* 16 zeros followed by a 1. */
1444      if (frame->coding_type == B_VOP)      else if (frame->coding_type == P_VOP)
1445          addbits = MAX(frame->fcode, frame->bcode)-1;        nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER-1 + frame->fcode;
1446        else /* B_VOP */
1447          nbitsresyncmarker = MAX(NUMBITS_VP_RESYNC_MARKER, NUMBITS_VP_RESYNC_MARKER-1 + MAX(frame->fcode, frame->bcode));
1448    
1449      BitstreamPadAlways(bs);      BitstreamPadAlways(bs);
     nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER + addbits;  
1450      BitstreamPutBits(bs, RESYNC_MARKER, nbitsresyncmarker);      BitstreamPutBits(bs, RESYNC_MARKER, nbitsresyncmarker);
1451      BitstreamPutBits(bs, mbnum, mbnum_bits);      BitstreamPutBits(bs, mbnum, mbnum_bits);
1452      BitstreamPutBits(bs, frame->quant, 5);      BitstreamPutBits(bs, frame->quant, 5);
Legend:
Removed from v.1616  
changed lines
  Added in v.1653
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4