[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 1553, Sun Oct 3 16:20:51 2004 UTC revision 1610, Sun Apr 10 00:27:25 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.47 2004-10-03 16:20:51 syskin Exp $   * $Id: bitstream.c,v 1.50 2005-04-10 00:27:25 suxen_drol Exp $
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 381  Line 381 
381  BitstreamReadHeaders(Bitstream * bs,  BitstreamReadHeaders(Bitstream * bs,
382                                           DECODER * dec,                                           DECODER * dec,
383                                           uint32_t * rounding,                                           uint32_t * rounding,
                                          uint32_t * reduced_resolution,  
384                                           uint32_t * quant,                                           uint32_t * quant,
385                                           uint32_t * fcode_forward,                                           uint32_t * fcode_forward,
386                                           uint32_t * fcode_backward,                                           uint32_t * fcode_backward,
# Line 862  Line 861 
861                                  dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR &&                                  dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR &&
862                                  (coding_type == P_VOP || coding_type == I_VOP)) {                                  (coding_type == P_VOP || coding_type == I_VOP)) {
863    
864                                  *reduced_resolution = BitstreamGetBit(bs);                                  if (BitstreamGetBit(bs));
865                                  DPRINTF(XVID_DEBUG_HEADER, "reduced_resolution %i\n", *reduced_resolution);                                          DPRINTF(XVID_DEBUG_ERROR, "RRV not supported (anymore)\n");
                         }  
                         else  
                         {  
                                 *reduced_resolution = 0;  
866                          }                          }
867    
868                          if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) {                          if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) {
# Line 1090  Line 1085 
1085          vol_type_ind = VIDOBJLAY_TYPE_ART_SIMPLE;          vol_type_ind = VIDOBJLAY_TYPE_ART_SIMPLE;
1086      }      }
1087    
1088          if ((pParam->vol_flags & XVID_VOL_QUARTERPEL) ||      if ((pParam->vol_flags & (XVID_VOL_MPEGQUANT|XVID_VOL_QUARTERPEL|XVID_VOL_GMC|XVID_VOL_INTERLACING)) ||
1089          (pParam->vol_flags & XVID_VOL_GMC)) {           pParam->max_bframes>0) {
1090          vol_type_ind = VIDOBJLAY_TYPE_ASP;          vol_type_ind = VIDOBJLAY_TYPE_ASP;
1091      }      }
1092    
# Line 1256  Line 1251 
1251    
1252          BitstreamPadAlways(bs); /* next_start_code(); */          BitstreamPadAlways(bs); /* next_start_code(); */
1253    
1254          /* fake divx5 id, to ensure compatibility with divx5 decoder */          /* divx5 userdata string */
1255  #define DIVX5_ID "DivX999b000p"  #define DIVX5_ID "DivX503b1393"
1256          if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED)) {    if ((pParam->global_flags & XVID_GLOBAL_DIVX5_USERDATA)) {
1257                  BitstreamWriteUserData(bs, DIVX5_ID, strlen(DIVX5_ID));                  BitstreamWriteUserData(bs, DIVX5_ID, strlen(DIVX5_ID));
1258            if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED))
1259          BitstreamPutBits(bs, 'p', 8);
1260          }          }
1261    
1262          /* xvid id */          /* xvid id */
# Line 1342  Line 1339 
1339                  BitstreamPutBits(bs, frame->rounding_type, 1);                  BitstreamPutBits(bs, frame->rounding_type, 1);
1340    
1341          if ((frame->vol_flags & XVID_VOL_REDUCED_ENABLE))          if ((frame->vol_flags & XVID_VOL_REDUCED_ENABLE))
1342                  BitstreamPutBit(bs, (frame->vop_flags & XVID_VOP_REDUCED)?1:0);                  BitstreamPutBit(bs, 0);
1343    
1344          BitstreamPutBits(bs, 0, 3);     /* intra_dc_vlc_threshold */          BitstreamPutBits(bs, 0, 3);     /* intra_dc_vlc_threshold */
1345    
Legend:
Removed from v.1553  
changed lines
  Added in v.1610
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4