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

Diff of /trunk/xvidcore/vfw/src/codec.c

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

revision 1597, Sun Jan 30 14:04:11 2005 UTC revision 1607, Sun Mar 27 03:59:42 2005 UTC
# Line 504  Line 504 
504    
505                  /* VBV */                  /* VBV */
506                  pass2.vbv_size = profiles[codec->config.profile].max_vbv_size;                  pass2.vbv_size = profiles[codec->config.profile].max_vbv_size;
507                  pass2.vbv_initial = (profiles[codec->config.profile].max_vbv_size*3)/4;                  pass2.vbv_initial = (profiles[codec->config.profile].max_vbv_size*3)/4; /* 75% */
508                  pass2.vbv_maxrate = 1000*profiles[codec->config.profile].max_bitrate;                  pass2.vbv_maxrate = profiles[codec->config.profile].max_bitrate;
509                  pass2.vbv_peakrate = 10000000; /* 10mbps -- fixme */  
510        // XXX: xvidcore current provides a "peak bits over 3secs" constraint.
511        //      according to the latest dxn literature, a 1sec constraint is now used
512        pass2.vbv_peakrate = profiles[codec->config.profile].vbv_peakrate * 3;
513    
514                  plugins[create.num_plugins].func = codec->xvid_plugin_2pass2_func;                  plugins[create.num_plugins].func = codec->xvid_plugin_2pass2_func;
515                  plugins[create.num_plugins].param = &pass2;                  plugins[create.num_plugins].param = &pass2;
# Line 563  Line 566 
566          create.max_quant[2] = codec->config.max_bquant;          create.max_quant[2] = codec->config.max_bquant;
567    
568          if ((profiles[codec->config.profile].flags & PROFILE_BVOP) && codec->config.use_bvop) {          if ((profiles[codec->config.profile].flags & PROFILE_BVOP) && codec->config.use_bvop) {
569    
570        /* dxn: prevent bframes usage if interlacing is selected */
571        if (!((profiles[codec->config.profile].flags & PROFILE_DXN) && codec->config.interlacing)) {
572                  create.max_bframes = codec->config.max_bframes;                  create.max_bframes = codec->config.max_bframes;
573                  create.bquant_ratio = codec->config.bquant_ratio;                  create.bquant_ratio = codec->config.bquant_ratio;
574                  create.bquant_offset = codec->config.bquant_offset;                  create.bquant_offset = codec->config.bquant_offset;
# Line 572  Line 578 
578    
579                  create.global |= XVID_GLOBAL_CLOSED_GOP;                  create.global |= XVID_GLOBAL_CLOSED_GOP;
580    
581          /* dxn: restrict max bframes and enable packed bframes */
582          if ((profiles[codec->config.profile].flags & PROFILE_DXN)) {
583    
584            if (create.max_bframes > profiles[codec->config.profile].dxn_max_bframes)
585              create.max_bframes = profiles[codec->config.profile].dxn_max_bframes;
586    
587            create.global |= XVID_GLOBAL_PACKED;
588          }
589        }
590          }          }
591    
592      /* dxn: always write divx5 userdata */
593      if ((profiles[codec->config.profile].flags & PROFILE_DXN))
594        create.global |= XVID_GLOBAL_DIVX5_USERDATA;
595    
596          create.frame_drop_ratio = codec->config.frame_drop_ratio;          create.frame_drop_ratio = codec->config.frame_drop_ratio;
597    
598          create.num_threads = codec->config.num_threads;          create.num_threads = codec->config.num_threads;
# Line 697  Line 716 
716          if ((profiles[codec->config.profile].flags & PROFILE_INTERLACE) && codec->config.interlacing)          if ((profiles[codec->config.profile].flags & PROFILE_INTERLACE) && codec->config.interlacing)
717                  frame.vol_flags |= XVID_VOL_INTERLACING;                  frame.vol_flags |= XVID_VOL_INTERLACING;
718    
719          if (codec->config.ar_mode == 0) { /* PAR */    /* dxn: force 1:1 picture aspect ration */
720      if ((profiles[codec->config.profile].flags & PROFILE_DXN)) {
721        frame.par = XVID_PAR_11_VGA;
722      } else if (codec->config.ar_mode == 0) { /* PAR */
723                  if (codec->config.display_aspect_ratio != 5) {                  if (codec->config.display_aspect_ratio != 5) {
724                          frame.par = codec->config.display_aspect_ratio + 1;                          frame.par = codec->config.display_aspect_ratio + 1;
725                  } else {                  } else {
# Line 728  Line 750 
750                  frame.vop_flags |= XVID_VOP_TRELLISQUANT;                  frame.vop_flags |= XVID_VOP_TRELLISQUANT;
751          }          }
752    
753      if ((profiles[codec->config.profile].flags & PROFILE_4MV)) {
754          if (codec->config.motion_search > 4)          if (codec->config.motion_search > 4)
755                  frame.vop_flags |= XVID_VOP_INTER4V;                  frame.vop_flags |= XVID_VOP_INTER4V;
756      }
757    
758          if (codec->config.chromame)          if (codec->config.chromame)
759                  frame.motion |= XVID_ME_CHROMA_PVOP + XVID_ME_CHROMA_BVOP;                  frame.motion |= XVID_ME_CHROMA_PVOP + XVID_ME_CHROMA_BVOP;

Legend:
Removed from v.1597  
changed lines
  Added in v.1607

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4