[svn] / branches / dev-api-4 / xvidcore / src / plugins / plugin_2pass2.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/plugins/plugin_2pass2.c

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

revision 1051, Thu May 29 14:18:18 2003 UTC revision 1063, Tue Jun 10 10:12:24 2003 UTC
# Line 25  Line 25 
25   * along with this program; if not, write to the Free Software   * along with this program; if not, write to the Free Software
26   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
27   *   *
28   * $Id: plugin_2pass2.c,v 1.1.2.18 2003-05-29 14:18:18 edgomez Exp $   * $Id: plugin_2pass2.c,v 1.1.2.21 2003-06-10 10:12:24 suxen_drol Exp $
29   *   *
30   *****************************************************************************/   *****************************************************************************/
31    
# Line 244  Line 244 
244          }          }
245    
246          /* Compute the target filesize */          /* Compute the target filesize */
247          if (rc->num_frames  < create->fbase/create->fincr) {      if (rc->param.bitrate<0) {
248            /* if negative, bitrate equals the target (int kbytes) */
249            rc->target = (-rc->param.bitrate) * 1024;
250    
251        }else if (rc->num_frames  < create->fbase/create->fincr) {
252                  /* Source sequence is less than 1s long, we do as if it was 1s long */                  /* Source sequence is less than 1s long, we do as if it was 1s long */
253                  rc->target = rc->param.bitrate / 8;                  rc->target = rc->param.bitrate / 8;
254          } else {          } else {
# Line 600  Line 604 
604          rc->overflow += rc->KFoverflow;          rc->overflow += rc->KFoverflow;
605          rc->KFoverflow = s->desired_length - data->length;          rc->KFoverflow = s->desired_length - data->length;
606    
607          if (kfdiff > 1) {  // non-consecutive keyframes          if (kfdiff > 1) {  /* non-consecutive keyframes */
608              rc->KFoverflow_partial = rc->KFoverflow / (kfdiff - 1);              rc->KFoverflow_partial = rc->KFoverflow / (kfdiff - 1);
609          }else{ // consecutive keyframes          }else{ /* consecutive keyframes */
610                          rc->overflow += rc->KFoverflow;                          rc->overflow += rc->KFoverflow;
611                          rc->KFoverflow = 0;                          rc->KFoverflow = 0;
612                          rc->KFoverflow_partial = 0;                          rc->KFoverflow_partial = 0;
613          }          }
614          rc->KF_idx++;          rc->KF_idx++;
615      } else {      } else {
616          // distribute part of the keyframe overflow          /* distribute part of the keyframe overflow */
617          rc->overflow += s->desired_length - data->length + rc->KFoverflow_partial;          rc->overflow += s->desired_length - data->length + rc->KFoverflow_partial;
618          rc->KFoverflow -= rc->KFoverflow_partial;          rc->KFoverflow -= rc->KFoverflow_partial;
619      }      }
# Line 826  Line 830 
830              next -= create->zones[i].frame;              next -= create->zones[i].frame;
831              rc->avg_weight += (double)(next * create->zones[i].increment) / (double)create->zones[i].base;              rc->avg_weight += (double)(next * create->zones[i].increment) / (double)create->zones[i].base;
832              n += next;              n += next;
833          }else{  // XVID_ZONE_QUANT          }else{  /* XVID_ZONE_QUANT */
834              for (j = create->zones[i].frame; j < next && j < rc->num_frames; j++ ) {              for (j = create->zones[i].frame; j < next && j < rc->num_frames; j++ ) {
835                  rc->stats[j].zone_mode = XVID_ZONE_QUANT;                  rc->stats[j].zone_mode = XVID_ZONE_QUANT;
836                  rc->stats[j].weight = (double)create->zones[i].increment / (double)create->zones[i].base;                  rc->stats[j].weight = (double)create->zones[i].increment / (double)create->zones[i].base;
Legend:
Removed from v.1051  
changed lines
  Added in v.1063
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4