[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 1891, Tue Aug 10 15:00:34 2010 UTC revision 2169, Thu Jan 17 14:19:40 2019 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.59 2010-08-10 15:00:06 Isibaar Exp $   * $Id$
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 129  Line 129 
129                  }                  }
130          }          }
131    
132          mbnum = BitstreamGetBits(bs, mbnum_bits);               /* macroblock_number */          mbnum = (mbnum_bits == 0) ? 0 : BitstreamGetBits(bs, mbnum_bits);               /* macroblock_number */
133          DPRINTF(XVID_DEBUG_HEADER, "mbnum %i\n", mbnum);          DPRINTF(XVID_DEBUG_HEADER, "mbnum %i\n", mbnum);
134    
135          if (dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY)          if (dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY)
# Line 860  Line 860 
860                                  dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR &&                                  dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR &&
861                                  (coding_type == P_VOP || coding_type == I_VOP)) {                                  (coding_type == P_VOP || coding_type == I_VOP)) {
862    
863                                  if (BitstreamGetBit(bs));                                  if (BitstreamGetBit(bs)) {
864                                          DPRINTF(XVID_DEBUG_ERROR, "RRV not supported (anymore)\n");                                          DPRINTF(XVID_DEBUG_ERROR, "RRV not supported (anymore)\n");
865                          }                          }
866                            }
867    
868                          if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) {                          if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) {
869                                  if(!(dec->sprite_enable == SPRITE_STATIC && coding_type == I_VOP)) {                                  if(!(dec->sprite_enable == SPRITE_STATIC && coding_type == I_VOP)) {
# Line 1072  Line 1073 
1073  void  void
1074  BitstreamWriteVolHeader(Bitstream * const bs,  BitstreamWriteVolHeader(Bitstream * const bs,
1075                                                  const MBParam * pParam,                                                  const MBParam * pParam,
1076                                                  const FRAMEINFO * const frame)                                                  const FRAMEINFO * const frame,
1077                                                    const int num_slices)
1078  {  {
1079          static const unsigned int vo_id = 0;          static const unsigned int vo_id = 0;
1080          static const unsigned int vol_id = 0;          static const unsigned int vol_id = 0;
# Line 1237  Line 1239 
1239          }          }
1240    
1241          BitstreamPutBit(bs, 1);         /* complexity_estimation_disable */          BitstreamPutBit(bs, 1);         /* complexity_estimation_disable */
1242          BitstreamPutBit(bs, 1);         /* resync_marker_disable */  
1243            if (num_slices > 1)
1244                    BitstreamPutBit(bs, 0);         /* resync_marker_enabled */
1245            else
1246                    BitstreamPutBit(bs, 1);         /* resync_marker_disabled */
1247    
1248          BitstreamPutBit(bs, 0);         /* data_partitioned */          BitstreamPutBit(bs, 0);         /* data_partitioned */
1249    
1250          if (vol_ver_id != 1) {          if (vol_ver_id != 1) {
# Line 1252  Line 1259 
1259          /* divx5 userdata string */          /* divx5 userdata string */
1260  #define DIVX5_ID ((char *)"DivX503b1393")  #define DIVX5_ID ((char *)"DivX503b1393")
1261    if ((pParam->global_flags & XVID_GLOBAL_DIVX5_USERDATA)) {    if ((pParam->global_flags & XVID_GLOBAL_DIVX5_USERDATA)) {
1262      BitstreamWriteUserData(bs, DIVX5_ID, strlen(DIVX5_ID));      BitstreamWriteUserData(bs, DIVX5_ID, (uint32_t)strlen(DIVX5_ID));
1263          if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED))          if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED))
1264        BitstreamPutBits(bs, 'p', 8);        BitstreamPutBits(bs, 'p', 8);
1265          }          }
# Line 1265  Line 1272 
1272                                  xvid_user_format,                                  xvid_user_format,
1273                                  XVID_BS_VERSION,                                  XVID_BS_VERSION,
1274                                  (frame->vop_flags & XVID_VOP_CARTOON)?'C':'\0');                                  (frame->vop_flags & XVID_VOP_CARTOON)?'C':'\0');
1275                  BitstreamWriteUserData(bs, xvid_user_data, strlen(xvid_user_data));                  BitstreamWriteUserData(bs, xvid_user_data, (uint32_t)strlen(xvid_user_data));
1276          }          }
1277  }  }
1278    
# Line 1386  Line 1393 
1393                                                  const char *data,                                                  const char *data,
1394                                                  const unsigned int length)                                                  const unsigned int length)
1395  {  {
1396          int i;          unsigned int i;
1397    
1398          BitstreamPad(bs);          BitstreamPad(bs);
1399          BitstreamPutBits(bs, USERDATA_START_CODE, 32);          BitstreamPutBits(bs, USERDATA_START_CODE, 32);
# Line 1446  Line 1453 
1453    
1454      if (frame->coding_type == I_VOP)      if (frame->coding_type == I_VOP)
1455        nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER;  /* 16 zeros followed by a 1. */        nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER;  /* 16 zeros followed by a 1. */
1456      else if (frame->coding_type == P_VOP)      else if (frame->coding_type == B_VOP) /* B_VOP */
1457        nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER-1 + frame->fcode;        nbitsresyncmarker = MAX(NUMBITS_VP_RESYNC_MARKER+1, NUMBITS_VP_RESYNC_MARKER + MAX(frame->fcode, frame->bcode) - 1);
1458      else /* B_VOP */      else /*(frame->coding_type == P_VOP)*/
1459        nbitsresyncmarker = MAX(NUMBITS_VP_RESYNC_MARKER+1, NUMBITS_VP_RESYNC_MARKER-1 + MAX(frame->fcode, frame->bcode));                  nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER + frame->fcode - 1;
1460    
     BitstreamPadAlways(bs);  
1461      BitstreamPutBits(bs, RESYNC_MARKER, nbitsresyncmarker);      BitstreamPutBits(bs, RESYNC_MARKER, nbitsresyncmarker);
1462      BitstreamPutBits(bs, mbnum, mbnum_bits);      BitstreamPutBits(bs, mbnum, mbnum_bits);
1463      BitstreamPutBits(bs, frame->quant, 5);      BitstreamPutBits(bs, frame->quant, 5);
Legend:
Removed from v.1891  
changed lines
  Added in v.2169
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4