Diff of /xvidcore/src/plugins/plugin_2pass2.c

-revision 1.1.2.2, Tue Apr  8 14:01:09 2003 UTC
+revision 1.1.2.37, Sat Jan 31 14:51:56 2004 UTC
 Line 1
  /******************************************************************************
   *
   * XviD Bit Rate Controller Library
-  * - VBR 2 pass bitrate controler implementation -
+  *  - VBR 2 pass bitrate controller implementation -
   *
-  * Copyright (C) 2002 Edouard Gomez <ed.gomez@wanadoo.fr>
+  *  Copyright (C)      2002 Foxer <email?>
+  *                     2002 Dirk Knop <dknop@gwdg.de>
+  *                2002-2003 Edouard Gomez <ed.gomez@free.fr>
+  *                     2003 Pete Ross <pross@xvid.org>
   *
-  * The curve treatment algorithm is the one implemented by Foxer <email?> and
+  *  This curve treatment algorithm is the one originally implemented by Foxer
-  * Dirk Knop <dknop@gwdg.de> for the XviD vfw dynamic library.
+  *  and tuned by Dirk Knop for the XviD vfw frontend.
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
-Line 26
+Line 29
   *
   *****************************************************************************/
+ #define BQUANT_PRESCALE
+ #undef COMPENSATE_FORMULA
+ /* forces second pass not to be bigger than first */
+ #undef PASS_SMALLER
+ /* automtically alters overflow controls (strength and improvement/degradation)
+         to fight most common problems without user's knowladge */
+ #define SMART_OVERFLOW_SETTING
  #include <stdio.h>
  #include <math.h>
+ #include <limits.h>
- #define RAD2DEG 57.295779513082320876798154814105
- #define DEG2RAD 0.017453292519943295769236907684886
  #include "../xvid.h"
  #include "../image/image.h"
+ /*****************************************************************************
+  * Some default settings
+  ****************************************************************************/
+ #define DEFAULT_KEYFRAME_BOOST 0
+ #define DEFAULT_OVERFLOW_CONTROL_STRENGTH 10
+ #define DEFAULT_CURVE_COMPRESSION_HIGH 0
+ #define DEFAULT_CURVE_COMPRESSION_LOW 0
+ #define DEFAULT_MAX_OVERFLOW_IMPROVEMENT 10
+ #define DEFAULT_MAX_OVERFLOW_DEGRADATION 10
+ /* Keyframe settings */
+ #define DEFAULT_KFREDUCTION 20
+ #define DEFAULT_KFTHRESHOLD 1
+ /*****************************************************************************
+  * Some default constants (can be tuned)
+  ****************************************************************************/
+ /* Specify the invariant part of the headers bits (header+MV)
+  * as  hlength/cst */
+ #define INVARIANT_HEADER_PART_IVOP 1 /* factor 1.0f   */
+ #define INVARIANT_HEADER_PART_PVOP 2 /* factor 0.5f   */
+ #define INVARIANT_HEADER_PART_BVOP 8 /* factor 0.125f */
+ /*****************************************************************************
+  * Structures
+  ****************************************************************************/
+ /* Statistics */
  typedef struct {
      int type;               /* first pass type */
      int quant;              /* first pass quant */
          int blks[3];                    /* k,m,y blks */
      int length;             /* first pass length */
+         int invariant;          /* what we assume as being invariant between the two passes, it's a sub part of header + MV bits */
      int scaled_length;     /* scaled length */
-     int desired_length;
+         int desired_length;     /* desired length; calculated during encoding */
- } stat_t;
+         int error;
+         int zone_mode;   /* XVID_ZONE_xxx */
+         double weight;
+ } twopass_stat_t;
+ /* Context struct */
- /* context struct */
  typedef struct
  {
      xvid_plugin_2pass2_t param;
-     /* constant statistical data */
+         /*----------------------------------
+          * constant statistical data
+          *--------------------------------*/
+         /* Number of frames of the sequence */
          int num_frames;
+         /* Number of Intra frames of the sequence */
      int num_keyframes;
-     uint64_t target;    /* target bitrate */
-     int count[3];   /* count of each frame types */
+         /* Target filesize to reach */
-     uint64_t tot_length[3];  /* total length of each frame types */
+         uint64_t target;
-     double avg_length[3];   /* avg */
-     int min_length[3];  /* min frame length of each frame types */
-     uint64_t tot_scaled_length[3];  /* total scaled length of each frame type */
-     int max_length;     /* max frame size */
-     double curve_comp_scale;
-     double movie_curve;
-         double alt_curve_low;
-         double alt_curve_high;
-         double alt_curve_low_diff;
-         double alt_curve_high_diff;
-     double alt_curve_curve_bias_bonus;
-         double alt_curve_mid_qual;
-         double alt_curve_qual_dev;
-     /* dynamic */
+         /* Count of each frame types */
+         int count[3];
+         /* Total length of each frame types (1st pass) */
+         uint64_t tot_length[3];
+         uint64_t tot_invariant[3];
+         /* Average length of each frame types (used first for 1st pass data and
+          * then for scaled averages */
+         double avg_length[3];
+         /* Minimum frame length allowed for each frame type */
+         int min_length[3];
+         /* Total bytes per frame type once the curve has been scaled
+          * NB: advanced parameters do not change this value. This field
+          *     represents the total scaled w/o any advanced settings */
+         uint64_t tot_scaled_length[3];
+         /* Maximum observed frame size observed during the first pass, the RC
+          * will try tp force all frame sizes in the second pass to be under that
+          * limit */
+         int max_length;
+         /*----------------------------------
+          * Zones statistical data
+          *--------------------------------*/
+         /* Total length used by XVID_ZONE_QUANT zones */
+         uint64_t tot_quant;
+         uint64_t tot_quant_invariant;
+         /* Holds the total amount of frame bytes, zone weighted (only scalable
+          * part of frame bytes) */
+         uint64_t tot_weighted;
+         /*----------------------------------
+          * Advanced settings helper ratios
+          *--------------------------------*/
+         /* This the ratio that has to be applied to all p/b frames in order
+          * to reserve/retrieve bits for/from keyframe boosting and consecutive
+          * keyframe penalty */
+         double pb_iboost_tax_ratio;
+         /* This the ratio to apply to all b/p frames in order to respect the
+          * assymetric curve compression while respecting a target filesize
+          * NB: The assymetric delta gain has to be computed before this ratio
+          *     is applied, and then the delta is added to the scaled size */
+         double assymetric_tax_ratio;
+         /*----------------------------------
+          * Data from the stats file kept
+          * into RAM for easy access
+          *--------------------------------*/
+         /* Array of keyframe locations
+          * eg: rc->keyframe_locations[100] returns the frame number of the 100th
+          *     keyframe */
      int * keyframe_locations;
-     stat_t * stats;
-     double pquant_error[32];
-     double bquant_error[32];
-     int quant_count[32];
-     int last_quant[3];
-     double curve_comp_error;
+         /* Index of the last keyframe used in the keyframe_location */
-     int overflow;
-     int KFoverflow;
-     int KFoverflow_partial;
      int KF_idx;
- } rc_2pass2_t;
+         /* Array of all 1st pass data file -- see the twopass_stat_t structure
+          * definition for more details */
+         twopass_stat_t * stats;
+         /*----------------------------------
+          * Histerysis helpers
+          *--------------------------------*/
+         /* This field holds the int2float conversion errors of each quant per
+          * frame type, this allow the RC to keep track of rouding error and thus
+          * increase or decrease the chosen quant according to this residue */
+         double quant_error[3][32];
+         /* This fields stores the count of each quant usage per frame type
+          * No real role but for debugging */
+         int quant_count[3][32];
+         /* Last valid quantizer used per frame type, it allows quantizer
+          * increament/decreament limitation in order to avoid big image quality
+          * "jumps" */
+         int last_quant[3];
- #define BUF_SZ 1024
+         /*----------------------------------
- #define MAX_COLS    5
+          * Overflow control
+          *--------------------------------*/
+         /* Current overflow that has to be distributed to p/b frames */
+         double overflow;
+         /* Total overflow for keyframes -- not distributed directly */
+         double KFoverflow;
+         /* Amount of keyframe overflow to introduce to the global p/b frame
+          * overflow counter at each encoded frame */
+         double KFoverflow_partial;
+         /* Unknown ???
+          * ToDo: description */
+         double fq_error;
+         int min_quant; /* internal minimal quant, prevents wrong quants from being used */
+         /*----------------------------------
+          * Debug
+          *--------------------------------*/
+         double desired_total;
+         double real_total;
+ } rc_2pass2_t;
- /* open stats file, and count num frames */
+ /*****************************************************************************
+  * Sub plugin functions prototypes
+  ****************************************************************************/
+ static int rc_2pass2_create(xvid_plg_create_t * create, rc_2pass2_t ** handle);
+ static int rc_2pass2_before(rc_2pass2_t * rc, xvid_plg_data_t * data);
+ static int rc_2pass2_after(rc_2pass2_t * rc, xvid_plg_data_t * data);
+ static int rc_2pass2_destroy(rc_2pass2_t * rc, xvid_plg_destroy_t * destroy);
+ /*****************************************************************************
+  * Plugin definition
+  ****************************************************************************/
- static int det_stats_length(rc_2pass2_t * rc, char * filename)
+ int
+ xvid_plugin_2pass2(void * handle, int opt, void * param1, void * param2)
  {
-     FILE * f;
+         switch(opt) {
-     int n, ignore;
+         case XVID_PLG_INFO :
-     char type;
+         case XVID_PLG_FRAME :
+                 return 0;
-     rc->num_frames = 0;
+         case XVID_PLG_CREATE :
-     rc->num_keyframes = 0;
+                 return rc_2pass2_create((xvid_plg_create_t*)param1, param2);
-     if ((f = fopen(filename, "rt")) == NULL)
+         case XVID_PLG_DESTROY :
-         return 0;
+                 return rc_2pass2_destroy((rc_2pass2_t*)handle, (xvid_plg_destroy_t*)param1);
-     while((n = fscanf(f, "%c %d %d %d %d %d %d\n",
+         case XVID_PLG_BEFORE :
-         &type, &ignore, &ignore, &ignore, &ignore, &ignore, &ignore)) != EOF) {
+                 return rc_2pass2_before((rc_2pass2_t*)handle, (xvid_plg_data_t*)param1);
-         if (type == 'i') {
-             rc->num_frames++;
-             rc->num_keyframes++;
-         }else if (type == 'p' || type == 'b' || type == 's') {
-             rc->num_frames++;
-         }
-     }
-     fclose(f);
+         case XVID_PLG_AFTER :
+                 return rc_2pass2_after((rc_2pass2_t*)handle, (xvid_plg_data_t*)param1);
+         }
-     return 1;
+         return XVID_ERR_FAIL;
  }
+ /*****************************************************************************
+  * Sub plugin functions definitions
+  ****************************************************************************/
+ /* First a few local helping function prototypes */
+ static  int statsfile_count_frames(rc_2pass2_t * rc, char * filename);
+ static  int statsfile_load(rc_2pass2_t *rc, char * filename);
+ static void zone_process(rc_2pass2_t *rc, const xvid_plg_create_t * create);
+ static void first_pass_stats_prepare_data(rc_2pass2_t * rc);
+ static void first_pass_scale_curve_internal(rc_2pass2_t *rc);
+ static void scaled_curve_apply_advanced_parameters(rc_2pass2_t * rc);
+ #if 0
+ static void stats_print(rc_2pass2_t * rc);
+ #endif
- /* scale the curve */
+ /*----------------------------------------------------------------------------
+  *--------------------------------------------------------------------------*/
- static void internal_scale(rc_2pass2_t *rc)
+ static int
+ rc_2pass2_create(xvid_plg_create_t * create, rc_2pass2_t **handle)
  {
-         int64_t target  = rc->target;
+         xvid_plugin_2pass2_t * param = (xvid_plugin_2pass2_t *)create->param;
-         int64_t tot_length = rc->tot_length[0] + rc->tot_length[1] + rc->tot_length[2];
+         rc_2pass2_t * rc;
-         int min_size[3];
-         double scaler;
          int i;
-         if (target <= 0 || target >= tot_length) {
+         rc = malloc(sizeof(rc_2pass2_t));
-                 printf("undersize warning\n");
+         if (rc == NULL)
-         }
+                 return XVID_ERR_MEMORY;
+         rc->param = *param;
-         /* perform an initial scale pass.
+         /* Initialize all defaults */
-            if a frame size is scaled underneath our hardcoded minimums, then we force the
+ #define _INIT(a, b) if((a) <= 0) (a) = (b)
-            frame size to the minimum, and deduct the original & scaled frmae length from the
+         /* Let's set our defaults if needed */
-            original and target total lengths */
+         _INIT(rc->param.keyframe_boost, DEFAULT_KEYFRAME_BOOST);
+         _INIT(rc->param.overflow_control_strength, DEFAULT_OVERFLOW_CONTROL_STRENGTH);
+         _INIT(rc->param.curve_compression_high, DEFAULT_CURVE_COMPRESSION_HIGH);
+         _INIT(rc->param.curve_compression_low, DEFAULT_CURVE_COMPRESSION_LOW);
+         _INIT(rc->param.max_overflow_improvement, DEFAULT_MAX_OVERFLOW_IMPROVEMENT);
+         _INIT(rc->param.max_overflow_degradation,  DEFAULT_MAX_OVERFLOW_DEGRADATION);
+         /* Keyframe settings */
+         _INIT(rc->param.kfreduction, DEFAULT_KFREDUCTION);
+         _INIT(rc->param.kfthreshold, DEFAULT_KFTHRESHOLD);
+ #undef _INIT
-         min_size[0] = ((rc->stats[0].blks[0]*22) + 240) / 8;
+         /* Initialize some stuff to zero */
-         min_size[1] = (rc->stats[0].blks[0] + 88) / 8;
+         for(i=0; i<3; i++) {
-         min_size[2] = 8;
+                 int j;
+                 for (j=0; j<32; j++) {
+                         rc->quant_error[i][j] = 0;
+                         rc->quant_count[i][j] = 0;
+                 }
+         }
+         for (i=0; i<3; i++) rc->last_quant[i] = 0;
-         scaler = (double)target / (double)tot_length;
+         rc->fq_error = 0;
-         //printf("target=%i, tot_length=%i, scaler=%f\n", (int)target, (int)tot_length, scaler);
+         rc->min_quant = 1;
-         for (i=0; i<rc->num_frames; i++) {
+         /* Count frames (and intra frames) in the stats file, store the result into
-                 stat_t * s = &rc->stats[i];
+          * the rc structure */
-                 int len;
+         if (statsfile_count_frames(rc, param->filename) == -1) {
+                 DPRINTF(XVID_DEBUG_RC,"[xvid rc] -- ERROR: fopen %s failed\n", param->filename);
+                 free(rc);
+                 return(XVID_ERR_FAIL);
+         }
-                 len = (int)((double)s->length * scaler);
+         /* Allocate the stats' memory */
-                 if (len < min_size[s->type]) {          /* force frame size */
+         if ((rc->stats = malloc(rc->num_frames * sizeof(twopass_stat_t))) == NULL) {
-                         s->scaled_length = min_size[s->type];
+                 free(rc);
-                         target -= s->scaled_length;
+                 return(XVID_ERR_MEMORY);
-                         tot_length -= s->length;
-                 }else{
-                         s->scaled_length = 0;
                  }
+         /* Allocate keyframes location's memory
+          * PS: see comment in pre_process0 for the +1 location requirement */
+         rc->keyframe_locations = malloc((rc->num_keyframes + 1) * sizeof(int));
+         if (rc->keyframe_locations == NULL) {
+                 free(rc->stats);
+                 free(rc);
+                 return(XVID_ERR_MEMORY);
          }
-         if (target <= 0 || target >= tot_length) {
+         /* Load the first pass stats */
-                 printf("undersize warning\n");
+         if (statsfile_load(rc, param->filename) == -1) {
-                 return;
+                 DPRINTF(XVID_DEBUG_RC,"[xvid rc] -- ERROR: fopen %s failed\n", param->filename);
+                 free(rc->keyframe_locations);
+                 free(rc->stats);
+                 free(rc);
+                 return XVID_ERR_FAIL;
          }
-         scaler = (double)target / (double)tot_length;
+         /* Compute the target filesize */
-         //printf("target=%i, tot_length=%i, scaler=%f\n", (int)target, (int)tot_length, scaler);
+         if (rc->param.bitrate<0) {
+                 /* if negative, bitrate equals the target (in kbytes) */
+                 rc->target = ((uint64_t)(-rc->param.bitrate)) * 1024;
+         } else if (rc->num_frames  < create->fbase/create->fincr) {
+                 /* Source sequence is less than 1s long, we do as if it was 1s long */
+                 rc->target = rc->param.bitrate / 8;
+         } else {
+                 /* Target filesize = bitrate/8 * numframes / framerate */
+                 rc->target =
+                         ((uint64_t)rc->param.bitrate * (uint64_t)rc->num_frames * \
+                          (uint64_t)create->fincr) / \
+                         ((uint64_t)create->fbase * 8);
+         }
+         DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- Frame rate: %d/%d (%ffps)\n",
+                         create->fbase, create->fincr,
+                         (double)create->fbase/(double)create->fincr);
+         DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- Number of frames: %d\n", rc->num_frames);
+         if(rc->param.bitrate>=0)
+                 DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- Target bitrate: %ld\n", rc->param.bitrate);
+         DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- Target filesize: %lld\n", rc->target);
+         /* Compensate the average frame overhead caused by the container */
+         rc->target -= rc->num_frames*rc->param.container_frame_overhead;
+         DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- Container Frame overhead: %d\n", rc->param.container_frame_overhead);
+         if(rc->param.container_frame_overhead)
+                 DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- New target filesize after container compensation: %lld\n", rc->target);
+         /* When bitrate is not given it means it has been scaled by an external
+          * application */
+         if (rc->param.bitrate) {
+                 /* Apply zone settings
+                  * - set rc->tot_quant which represents the total num of bytes spent in
+                  *   fixed quant zones
+                  * - set rc->tot_weighted which represents the total amount of bytes
+                  *   spent in normal or weighted zones in first pass (normal zones can
+                  *   be considered weight=1)
+                  * - set rc->tot_quant_invariant which represents the total num of bytes
+                  *   spent in fixed quant zones for headers */
+                 zone_process(rc, create);
+         } else {
+                 /* External scaling -- zones are ignored */
          for (i=0; i<rc->num_frames; i++) {
-                 stat_t * s = &rc->stats[i];
+                         rc->stats[i].zone_mode = XVID_ZONE_WEIGHT;
+                         rc->stats[i].weight = 1.0;
-                 if (s->scaled_length==0) {      /* ignore frame with forced frame sizes */
-                         s->scaled_length = (int)((double)s->length * scaler);
                  }
+                 rc->tot_quant = 0;
          }
- }
+         /* Gathers some information about first pass stats:
+          *  - finds the minimum frame length for each frame type during 1st pass.
+          *     rc->min_size[]
+          *  - determines the maximum frame length observed (no frame type distinction).
+          *     rc->max_size
+          *  - count how many times each frame type has been used.
+          *     rc->count[]
+          *  - total bytes used per frame type
+          *     rc->tot_length[]
+          *  - total bytes considered invariant between the 2 passes
+          *  - store keyframe location
+          *     rc->keyframe_locations[]
+          */
+         first_pass_stats_prepare_data(rc);
+         /* If we have a user bitrate, it means it's an internal curve scaling */
+         if (rc->param.bitrate) {
+                 /* Perform internal curve scaling */
+                 first_pass_scale_curve_internal(rc);
+         }
+         /* Apply advanced curve options, and compute some parameters in order to
+          * shape the curve in the BEFORE/AFTER pair of functions */
+         scaled_curve_apply_advanced_parameters(rc);
+         *handle = rc;
+         return(0);
+ }
+ /*----------------------------------------------------------------------------
+  *--------------------------------------------------------------------------*/
- /* static void internal_scale(rc_2pass2_t *rc)
+ static int
+ rc_2pass2_destroy(rc_2pass2_t * rc, xvid_plg_destroy_t * destroy)
  {
-     const double avg_pvop = rc->avg_length[XVID_TYPE_PVOP-1];
+         DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- target_total:%lld desired_total:%.2f (%.2f%%) actual_total:%.2f (%.2f%%)\n",
-     const double avg_bvop = rc->avg_length[XVID_TYPE_BVOP-1];
+                         rc->target,
-     const uint64_t tot_pvop = rc->tot_length[XVID_TYPE_PVOP-1];
+                         rc->desired_total,
-     const uint64_t tot_bvop = rc->tot_length[XVID_TYPE_BVOP-1];
+*rc->desired_total/(double)rc->target,
-     uint64_t i_total = 0;
+                         rc->real_total,
-         double total1,total2;
+*rc->real_total/(double)rc->target);
-     int i;
-     for (i=0; i<rc->num_frames; i++) {
-         stat_t * s = &rc->stats[i];
-                 if (s->type == XVID_TYPE_IVOP) {
+         free(rc->keyframe_locations);
-                         i_total += s->length + s->length * rc->param.keyframe_boost / 100;
+         free(rc->stats);
-         }
+         free(rc);
+         return(0);
          }
-         // compensate for avi frame overhead
+ /*----------------------------------------------------------------------------
-         rc->target_size -= rc->num_frames * 24;
+  *--------------------------------------------------------------------------*/
-         // perform prepass to compensate for over/undersizing
+ static int
+ rc_2pass2_before(rc_2pass2_t * rc, xvid_plg_data_t * data)
+ {
+         twopass_stat_t * s = &rc->stats[data->frame_num];
+         double dbytes;
+         double scaled_quant;
+         double overflow;
+         int capped_to_max_framesize = 0;
-         if (rc->param.use_alt_curve) {
+         /* This function is quite long but easy to understand. In order to simplify
+          * the code path (a bit), we treat 3 cases that can return immediatly. */
-         rc->alt_curve_low = avg_pvop - avg_pvop * (double)rc->param.alt_curve_low_dist / 100.0;
+         /* First case: Another plugin has already set a quantizer */
-                 rc->alt_curve_low_diff = avg_pvop - rc->alt_curve_low;
+         if (data->quant > 0)
-                 rc->alt_curve_high = avg_pvop + avg_pvop * (double)rc->param.alt_curve_high_dist / 100.0;
+                 return(0);
-                 rc->alt_curve_high_diff = rc->alt_curve_high - avg_pvop;
-                 if (rc->alt_curve_use_auto) {
-                         if (rc->movie_curve > 1.0) {
-                                 rc->param.alt_curve_min_rel_qual = (int)(100.0 - (100.0 - 100.0 / rc->movie_curve) * (double)rc->param.alt_curve_auto_str / 100.0);
-                                 if (rc->param.alt_curve_min_rel_qual < 20)
-                                         rc->param.alt_curve_min_rel_qual = 20;
-             }else{
-                                 rc->param.alt_curve_min_rel_qual = 100;
-             }
-                 }
-                 rc->alt_curve_mid_qual = (1.0 + (double)rc->param.alt_curve_min_rel_qual / 100.0) / 2.0;
-                 rc->alt_curve_qual_dev = 1.0 - rc->alt_curve_mid_qual;
-                 if (rc->param.alt_curve_low_dist > 100) {
+         /* Second case: insufficent stats data
-                         switch(rc->param.alt_curve_type) {
+          * We can't guess much what we should do, let core decide all alone */
-                         case XVID_CURVE_SINE : // Sine Curve (high aggressiveness)
+         if (data->frame_num >= rc->num_frames) {
-                                 rc->alt_curve_qual_dev *= 2.0 / (1.0 + sin(DEG2RAD * (avg_pvop * 90.0 / rc->alt_curve_low_diff)));
+                 DPRINTF(XVID_DEBUG_RC,"[xvid rc] -- stats file too short (now processing frame %d)",
-                                 rc->alt_curve_mid_qual = 1.0 - rc->alt_curve_qual_dev * sin(DEG2RAD * (avg_pvop * 90.0 / rc->alt_curve_low_diff));
+                         data->frame_num);
-                                 break;
+                 return(0);
-                         case XVID_CURVE_LINEAR : // Linear (medium aggressiveness)
-                                 rc->alt_curve_qual_dev *= 2.0 / (1.0 + avg_pvop / rc->alt_curve_low_diff);
-                                 rc->alt_curve_mid_qual = 1.0 - rc->alt_curve_qual_dev * avg_pvop / rc->alt_curve_low_diff;
-                                 break;
-                         case XVID_CURVE_COSINE : // Cosine Curve (low aggressiveness)
-                                 rc->alt_curve_qual_dev *= 2.0 / (1.0 +  (1.0 - cos(DEG2RAD * (avg_pvop * 90.0 / rc->alt_curve_low_diff))));
-                                 rc->alt_curve_mid_qual = 1.0 - rc->alt_curve_qual_dev * (1.0 - cos(DEG2RAD * (avg_pvop * 90.0 / rc->alt_curve_low_diff)));
-                         }
                  }
+         /* Third case: We are in a Quant zone
+          * Quant zones must just ensure we use the same settings as first pass
+          * So set the quantizer and the type */
+         if (s->zone_mode == XVID_ZONE_QUANT) {
+                 /* Quant stuff */
+                 rc->fq_error += s->weight;
+                 data->quant = (int)rc->fq_error;
+                 rc->fq_error -= data->quant;
+                 /* The type stuff */
+                 data->type = s->type;
+                 /* The only required data for AFTER step is this one for the overflow
+                  * control */
+                 s->desired_length = s->length;
+                 return(0);
          }
-         total1 = 0;
-         total2 = 0;
-     for (i=0; i<rc->num_frames; i++) {
+         /*************************************************************************/
-         stat_t * s = &rc->stats[i];
+         /*************************************************************************/
+         /*************************************************************************/
-                 if (s->type != XVID_TYPE_IVOP) {
+         /*-------------------------------------------------------------------------
+          * Frame bit allocation first part
+          *
+          * First steps apply user settings, just like it is done in the theoritical
+          * scaled_curve_apply_advanced_parameters
+          *-----------------------------------------------------------------------*/
-             double dbytes = s->length / rc->movie_curve;
+         /* Set desired to what we are wanting to obtain for this frame */
-             double dbytes2;
+         dbytes = (double)s->scaled_length;
-                         total1 += dbytes;
-                         if (s->type == XVID_TYPE_BVOP)
+         /* IFrame user settings*/
-                                 dbytes *= avg_pvop / avg_bvop;
+         if (s->type == XVID_TYPE_IVOP) {
+                 /* Keyframe boosting -- All keyframes benefit from it */
+                 dbytes += dbytes*rc->param.keyframe_boost / 100;
-                         if (rc->param.use_alt_curve) {
+ #if 0 /* ToDo: decide how to apply kfthresholding */
-                                 if (dbytes > avg_pvop) {
+ #endif
-                     if (dbytes >= rc->alt_curve_high) {
-                                                 dbytes2 = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev);
-                     }else{
-                                                 switch(rc->param.alt_curve_type){
-                                                 case XVID_CURVE_SINE :
-                                                     dbytes2 = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * sin(DEG2RAD * ((dbytes - avg_pvop) * 90.0 / rc->alt_curve_high_diff)));
-                                                         break;
-                                                 case XVID_CURVE_LINEAR :
-                                                     dbytes2 = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * (dbytes - avg_pvop) / rc->alt_curve_high_diff);
-                                                         break;
-                                                 case XVID_CURVE_COSINE :
-                                                     dbytes2 = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * (1.0 - cos(DEG2RAD * ((dbytes - avg_pvop) * 90.0 / rc->alt_curve_high_diff))));
-                                                 }
-                                         }
-                                 }else{
-                     if (dbytes <= rc->alt_curve_low){
-                                                 dbytes2 = dbytes;
-                     }else{
-                                                 switch(rc->param.alt_curve_type){
-                                                 case XVID_CURVE_SINE :
-                                                     dbytes2 = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * sin(DEG2RAD * ((dbytes - avg_pvop) * 90.0 / rc->alt_curve_low_diff)));
-                                                         break;
-                                                 case XVID_CURVE_LINEAR :
-                                                     dbytes2 = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * (dbytes - avg_pvop) / rc->alt_curve_low_diff);
-                                                         break;
-                                                 case XVID_CURVE_COSINE :
-                                                     dbytes2 = dbytes * (rc->alt_curve_mid_qual + rc->alt_curve_qual_dev * (1.0 - cos(DEG2RAD * ((dbytes - avg_pvop) * 90.0 / rc->alt_curve_low_diff))));
-                                                 }
-                                         }
-                                 }
-                         }else{
-                 if (dbytes > avg_pvop) {
-                                         dbytes2 = ((double)dbytes + (avg_pvop - dbytes) *
-                                                 rc->param.curve_compression_high / 100.0);
                                  }else{
-                                         dbytes2 = ((double)dbytes + (avg_pvop - dbytes) *
-                                                 rc->param.curve_compression_low / 100.0);
-                                 }
-                         }
-                         if (s->type == XVID_TYPE_BVOP) {
+                 /* P/S/B frames must reserve some bits for iframe boosting */
-                                 dbytes2 *= avg_bvop / avg_pvop;
+                 dbytes *= rc->pb_iboost_tax_ratio;
-             }
-             if (dbytes2 < rc->min_length[s->type-1]) {
+                 /* Apply assymetric curve compression */
-                 dbytes = rc->min_length[s->type-1];
+                 if (rc->param.curve_compression_high || rc->param.curve_compression_low) {
-             }
+                         double assymetric_delta;
-             total2 += dbytes2;
+                         /* Compute the assymetric delta, this is computed before applying
-                 }
+                          * the tax, as done in the pre_process function */
-         }
+                         if (dbytes > rc->avg_length[s->type-1])
+                                 assymetric_delta = (rc->avg_length[s->type-1] - dbytes) * rc->param.curve_compression_high / 100.0;
+                         else
+                                 assymetric_delta = (rc->avg_length[s->type-1] - dbytes) * rc->param.curve_compression_low  / 100.0;
-         rc->curve_comp_scale = total1 / total2;
+                         /* Now we must apply the assymetric tax, else our curve compression
+                          * would not give a theoritical target size equal to what it is
+                          * expected */
+                         dbytes *= rc->assymetric_tax_ratio;
-         if (!rc->param.use_alt_curve) {
+                         /* Now we can add the assymetric delta */
-                 printf("middle frame size for asymmetric curve compression: %i",
+                         dbytes += assymetric_delta;
-             (int)(avg_pvop * rc->curve_comp_scale));
+                 }
          }
- }*/
- /* open stats file(s) and read into rc->stats array */
+         /* That is what we would like to have -- Don't put that chunk after
+          * overflow control, otherwise, overflow is counted twice and you obtain
+          * half sized bitrate sequences */
+         s->desired_length  = (int)dbytes;
+         rc->desired_total += dbytes;
- static int load_stats(rc_2pass2_t *rc, char * filename)
+         /*------------------------------------------------------------------------
- {
+          * Frame bit allocation: overflow control part.
-     FILE * f;
+          *
-     int i, not_scaled;
+          * Unlike the theoritical scaled_curve_apply_advanced_parameters, here
+          * it's real encoding and we need to make sure we don't go so far from
+          * what is our ideal scaled curve.
+          *-----------------------------------------------------------------------*/
+         /* Compute the overflow we should compensate */
+         if (s->type != XVID_TYPE_IVOP || rc->overflow > 0) {
+                 double frametype_factor;
+                 double framesize_factor;
+                 /* Take only the desired part of overflow */
+                 overflow = rc->overflow;
-     if ((f = fopen(filename, "rt"))==NULL)
+                 /* Factor that will take care to decrease the overflow applied
-         return 0;
+                  * according to the importance of this frame type in term of
+                  * overall size */
+                 frametype_factor  = rc->count[XVID_TYPE_IVOP-1]*rc->avg_length[XVID_TYPE_IVOP-1];
+                 frametype_factor += rc->count[XVID_TYPE_PVOP-1]*rc->avg_length[XVID_TYPE_PVOP-1];
+                 frametype_factor += rc->count[XVID_TYPE_BVOP-1]*rc->avg_length[XVID_TYPE_BVOP-1];
+                 frametype_factor /= rc->count[s->type-1]*rc->avg_length[s->type-1];
+                 frametype_factor  = 1/frametype_factor;
+                 /* Factor that will take care not to compensate too much for this frame
+                  * size */
+                 framesize_factor  = dbytes;
+                 framesize_factor /= rc->avg_length[s->type-1];
+                 /* Treat only the overflow part concerned by this frame type and size */
+                 overflow *= frametype_factor;
+ #if 0
+                 /* Leave this one alone, as it impacts badly on quality */
+                 overflow *= framesize_factor;
+ #endif
+                 /* Apply the overflow strength imposed by the user */
+                 overflow *= (rc->param.overflow_control_strength/100.0f);
+         } else {
+                 /* no negative overflow applied in IFrames because:
+                  *  - their role is important as they're references for P/BFrames.
+                  *  - there aren't much in typical sequences, so if an IFrame overflows too
+                  *    much, this overflow may impact the next IFrame too much and generate
+                  *    a sequence of poor quality frames */
+                 overflow = 0;
+         }
-     i = 0;
+         /* Make sure we are not trying to compensate more overflow than we even have */
-         not_scaled = 0;
+         if (fabs(overflow) > fabs(rc->overflow))
-     while(i < rc->num_frames) {
+                 overflow = rc->overflow;
-         stat_t * s = &rc->stats[i];
-         int n;
-         char type;
-                 s->scaled_length = 0;
+         /* Make sure the overflow doesn't make the frame size to get out of the range
-         n = fscanf(f, "%c %d %d %d %d %d %d\n", &type, &s->quant, &s->blks[0], &s->blks[1], &s->blks[2], &s->length, &s->scaled_length);
+          * [-max_degradation..+max_improvment] */
-         if (n == EOF) break;
+         if (overflow > dbytes*rc->param.max_overflow_improvement / 100) {
-                 if (n < 7) {
+                 if(overflow <= dbytes)
-                         not_scaled = 1;
+                         dbytes += dbytes * rc->param.max_overflow_improvement / 100;
+                 else
+                         dbytes += overflow * rc->param.max_overflow_improvement / 100;
+         } else if (overflow < - dbytes * rc->param.max_overflow_degradation / 100) {
+                 dbytes -= dbytes * rc->param.max_overflow_degradation / 100;
+         } else {
+                 dbytes += overflow;
                  }
-         if (type == 'i') {
+         /*-------------------------------------------------------------------------
-             s->type = XVID_TYPE_IVOP;
+          * Frame bit allocation last part:
-         }else if (type == 'p' || type == 's') {
+          *
-             s->type = XVID_TYPE_PVOP;
+          * Cap frame length so we don't reach neither bigger frame sizes than first
-         }else if (type == 'b') {
+          * pass nor smaller than the allowed minimum.
-             s->type = XVID_TYPE_BVOP;
+          *-----------------------------------------------------------------------*/
-         }else{  /* unknown type */
-             printf("unk\n");
+ #ifdef PASS_SMALLER
-             continue;
+         if (dbytes > s->length) {
+                 dbytes = s->length;
          }
+ #endif
-         i++;
+         /* Prevent stupid desired sizes under logical values */
+         if (dbytes < rc->min_length[s->type-1]) {
+                 dbytes = rc->min_length[s->type-1];
      }
-     rc->num_frames = i;
-     fclose(f);
-     return 1;
+         /*------------------------------------------------------------------------
- }
+          * Desired frame length <-> quantizer mapping
+          *-----------------------------------------------------------------------*/
+ #ifdef BQUANT_PRESCALE
+         /* For bframes we prescale the quantizer to avoid too high quant scaling */
+         if(s->type == XVID_TYPE_BVOP) {
+                 twopass_stat_t *b_ref = s;
+                 /* Find the reference frame */
+                 while(b_ref != &rc->stats[0] && b_ref->type == XVID_TYPE_BVOP)
+                         b_ref--;
+                 /* Compute the original quant */
+                 s->quant  = 2*(100*s->quant - data->bquant_offset);
+                 s->quant += data->bquant_ratio - 1; /* to avoid rounding issues */
+                 s->quant  = s->quant/data->bquant_ratio - b_ref->quant;
+         }
+ #endif
+         /* Don't laugh at this very 'simple' quant<->size relationship, it
+          * proves to be acurate enough for our algorithm */
+         scaled_quant = (double)s->quant*(double)s->length/(double)dbytes;
+ #ifdef COMPENSATE_FORMULA
+         /* We know xvidcore will apply the bframe formula again, so we compensate
+          * it right now to make sure we would not apply it twice */
+         if(s->type == XVID_TYPE_BVOP) {
+                 twopass_stat_t *b_ref = s;
- static void print_stats(rc_2pass2_t * rc)
+                 /* Find the reference frame */
- {
+                 while(b_ref != &rc->stats[0] && b_ref->type == XVID_TYPE_BVOP)
-     int i;
+                         b_ref--;
-     for (i = 0; i < rc->num_frames; i++) {
-         stat_t * s = &rc->stats[i];
-         printf("%i %i %i %i\n", s->type, s->quant, s->length, s->scaled_length);
+                 /* Compute the quant it would be if the core did not apply the bframe
+                  * formula */
+                 scaled_quant  = 100*scaled_quant - data->bquant_offset;
+                 scaled_quant += data->bquant_ratio - 1; /* to avoid rouding issues */
+                 scaled_quant /= data->bquant_ratio;
      }
- }
+ #endif
+         /* Quantizer has been scaled using floating point operations/results, we
+          * must cast it to integer */
+         data->quant = (int)scaled_quant;
- /* pre-process the statistics data
+         /* Let's clip the computed quantizer, if needed */
-     this is a clone of vfw/src/2pass.c:codec_2pass_init minus file reading, alt_curve, internal scale
+         if (data->quant < 1) {
- */
+                 data->quant = 1;
+         } else if (data->quant > 31) {
+                 data->quant = 31;
+         } else {
- void pre_process0(rc_2pass2_t * rc)
+                 /* The frame quantizer has not been clipped, this appears to be a good
- {
+                  * computed quantizer, do not loose quantizer decimal part that we
-     int i,j;
+                  * accumulate for later reuse when its sum represents a complete
+                  * unit. */
+                 rc->quant_error[s->type-1][data->quant] += scaled_quant - (double)data->quant;
-     for (i=0; i<3; i++) {
+                 if (rc->quant_error[s->type-1][data->quant] >= 1.0) {
-         rc->count[i]=0;
+                         rc->quant_error[s->type-1][data->quant] -= 1.0;
-         rc->tot_length[i] = 0;
+                         data->quant++;
-         rc->last_quant[i] = 0;
+                 } else if (rc->quant_error[s->type-1][data->quant] <= -1.0) {
+                         rc->quant_error[s->type-1][data->quant] += 1.0;
+                         data->quant--;
      }
-     for (i=0; i<32;i++) {
-         rc->pquant_error[i] = 0;
-         rc->bquant_error[i] = 0;
-         rc->quant_count[i] = 0;
      }
-     for (i=j=0; i<rc->num_frames; i++) {
+         /* Now we have a computed quant that is in the right quante range, with a
-         stat_t * s = &rc->stats[i];
+          * possible +1 correction due to cumulated error. We can now safely clip
+          * the quantizer again with user's quant ranges. "Safely" means the Rate
-         rc->count[s->type-1]++;
+          * Control could learn more about this quantizer, this knowledge is useful
-         rc->tot_length[s->type-1] += s->length;
+          * for future frames even if it this quantizer won't be really used atm,
+          * that's why we don't perform this clipping earlier. */
-         if (i == 0 || s->length < rc->min_length[s->type-1]) {
+         if (data->quant < data->min_quant[s->type-1]) {
-             rc->min_length[s->type-1] = s->length;
+                 data->quant = data->min_quant[s->type-1];
+         } else if (data->quant > data->max_quant[s->type-1]) {
+                 data->quant = data->max_quant[s->type-1];
          }
-         if (i == 0 || s->length > rc->max_length) {
+         if (data->quant < rc->min_quant) data->quant = rc->min_quant;
-             rc->max_length = s->length;
-         }
-         if (s->type == XVID_TYPE_IVOP) {
+         /* To avoid big quality jumps from frame to frame, we apply a "security"
-             rc->keyframe_locations[j] = i;
+          * rule that makes |last_quant - new_quant| <= 2. This rule only applies
-             j++;
+          * to predicted frames (P and B) */
+         if (s->type != XVID_TYPE_IVOP && rc->last_quant[s->type-1] && capped_to_max_framesize == 0) {
+                 if (data->quant > rc->last_quant[s->type-1] + 2) {
+                         data->quant = rc->last_quant[s->type-1] + 2;
+                         DPRINTF(XVID_DEBUG_RC,
+                                         "[xvid rc] -- frame %d p/b-frame quantizer prevented from rising too steeply\n",
+                                         data->frame_num);
          }
+                 if (data->quant < rc->last_quant[s->type-1] - 2) {
+                         data->quant = rc->last_quant[s->type-1] - 2;
+                         DPRINTF(XVID_DEBUG_RC,
+                                         "[xvid rc] -- frame:%d p/b-frame quantizer prevented from falling too steeply\n",
+                                         data->frame_num);
      }
-     rc->keyframe_locations[j] = i;
  }
+         /* We don't want to pollute the RC histerisis when our computed quant has
+          * been computed from a capped frame size */
+         if (capped_to_max_framesize == 0)
+                 rc->last_quant[s->type-1] = data->quant;
+         /* Don't forget to force 1st pass frame type ;-) */
+         data->type = s->type;
- void pre_process1(rc_2pass2_t * rc)
+         return 0;
- {
+ }
-     int i;
-     double total1, total2;
-     uint64_t ivop_boost_total;
-     ivop_boost_total = 0;
+ /*----------------------------------------------------------------------------
-     rc->curve_comp_error = 0;
+  *--------------------------------------------------------------------------*/
-     for (i=0; i<3; i++) {
+ static int
-         rc->tot_scaled_length[i] = 0;
+ rc_2pass2_after(rc_2pass2_t * rc, xvid_plg_data_t * data)
-     }
+ {
+         const char frame_type[4] = { 'i', 'p', 'b', 's'};
+         twopass_stat_t * s = &rc->stats[data->frame_num];
-     for (i=0; i<rc->num_frames; i++) {
+         /* Insufficent stats data */
-         stat_t * s = &rc->stats[i];
+         if (data->frame_num >= rc->num_frames)
+                 return 0;
-         rc->tot_scaled_length[s->type-1] += s->scaled_length;
+         /* Update the quantizer counter */
+         rc->quant_count[s->type-1][data->quant]++;
-         if (s->type == XVID_TYPE_IVOP) {
+         /* Update the frame type overflow */
-             ivop_boost_total += s->scaled_length * rc->param.keyframe_boost / 100;
+         if (data->type == XVID_TYPE_IVOP) {
-         }
+                 int kfdiff = 0;
+                 if(rc->KF_idx != rc->num_frames -1) {
+                         kfdiff  = rc->keyframe_locations[rc->KF_idx+1];
+                         kfdiff -= rc->keyframe_locations[rc->KF_idx];
      }
-     rc->movie_curve = ((double)(rc->tot_scaled_length[XVID_TYPE_PVOP-1] + rc->tot_scaled_length[XVID_TYPE_BVOP-1] + ivop_boost_total) /
+                 /* Flush Keyframe overflow accumulator */
-                                         (rc->tot_scaled_length[XVID_TYPE_PVOP-1] + rc->tot_scaled_length[XVID_TYPE_BVOP-1]));
+                 rc->overflow += rc->KFoverflow;
-     for(i=0; i<3; i++) {
+                 /* Store the frame overflow to the keyframe accumulator */
-         if (rc->count[i] == 0 || rc->movie_curve == 0) {
+                 rc->KFoverflow = s->desired_length - data->length;
-             rc->avg_length[i] = 1;
+                 if (kfdiff > 1) {
+                         /* Non-consecutive keyframes case:
+                          * We can then divide this total keyframe overflow into equal parts
+                          * that we will distribute into regular overflow at each frame
+                          * between the sequence bounded by two IFrames */
+                         rc->KFoverflow_partial = rc->KFoverflow / (kfdiff - 1);
          }else{
-             rc->avg_length[i] = rc->tot_scaled_length[i] / rc->count[i] / rc->movie_curve;
+                         /* Consecutive keyframes case:
-         }
+                          * Flush immediatly the keyframe overflow and reset keyframe
+                          * overflow */
+                         rc->overflow += rc->KFoverflow;
+                         rc->KFoverflow = 0;
+                         rc->KFoverflow_partial = 0;
      }
+                 rc->KF_idx++;
+         } else {
+                 /* Accumulate the frame overflow */
+                 rc->overflow += s->desired_length - data->length;
-     /* alt curve stuff here */
+                 /* Distribute part of the keyframe overflow */
+                 rc->overflow += rc->KFoverflow_partial;
-     if (rc->param.use_alt_curve) {
+                 /* Don't forget to substract that same amount from the total keyframe
-         const double avg_pvop = rc->avg_length[XVID_TYPE_PVOP-1];
+                  * overflow */
-         const uint64_t tot_pvop = rc->tot_length[XVID_TYPE_PVOP-1];
+                 rc->KFoverflow -= rc->KFoverflow_partial;
-         const uint64_t tot_bvop = rc->tot_length[XVID_TYPE_BVOP-1];
+         }
-         const uint64_t tot_scaled_pvop = rc->tot_scaled_length[XVID_TYPE_PVOP-1];
-         const uint64_t tot_scaled_bvop = rc->tot_scaled_length[XVID_TYPE_BVOP-1];
-                 rc->alt_curve_low = avg_pvop - avg_pvop * (double)rc->param.alt_curve_low_dist / 100.0;
+         rc->overflow += (s->error = s->desired_length - data->length);
-                 rc->alt_curve_low_diff = avg_pvop - rc->alt_curve_low;
+         rc->real_total += data->length;
-                 rc->alt_curve_high = avg_pvop + avg_pvop * (double)rc->param.alt_curve_high_dist / 100.0;
-                 rc->alt_curve_high_diff = rc->alt_curve_high - avg_pvop;
-         if (rc->param.alt_curve_use_auto) {
+         DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- frame:%d type:%c quant:%d stats:%d scaled:%d desired:%d actual:%d error:%d overflow:%.2f\n",
-             if (tot_bvop + tot_pvop > tot_scaled_bvop + tot_scaled_pvop) {
+                         data->frame_num,
-                                 rc->param.alt_curve_min_rel_qual = (int)(100.0 - (100.0 - 100.0 /
+                         frame_type[data->type-1],
-                                         ((double)(tot_pvop + tot_bvop) / (double)(tot_scaled_pvop + tot_scaled_bvop))) * (double)rc->param.alt_curve_auto_str / 100.0);
+                         data->quant,
+                         s->length,
+                         s->scaled_length,
+                         s->desired_length,
+                         s->desired_length - s->error,
+                         -s->error,
+                         rc->overflow);
-                                 if (rc->param.alt_curve_min_rel_qual < 20)
+         return(0);
-                                         rc->param.alt_curve_min_rel_qual = 20;
-             }else{
-                                 rc->param.alt_curve_min_rel_qual = 100;
-             }
          }
-                 rc->alt_curve_mid_qual = (1.0 + (double)rc->param.alt_curve_min_rel_qual / 100.0) / 2.0;
-                 rc->alt_curve_qual_dev = 1.0 - rc->alt_curve_mid_qual;
-         if (rc->param.alt_curve_low_dist > 100) {
+ /*****************************************************************************
-                         switch(rc->param.alt_curve_type) {
+  * Helper functions definition
-             case XVID_CURVE_SINE: // Sine Curve (high aggressiveness)
+  ****************************************************************************/
-                                 rc->alt_curve_qual_dev *= 2.0 / (1.0 + sin(DEG2RAD * (avg_pvop * 90.0 / rc->alt_curve_low_diff)));
-                                 rc->alt_curve_mid_qual = 1.0 - rc->alt_curve_qual_dev * sin(DEG2RAD * (avg_pvop * 90.0 / rc->alt_curve_low_diff));
-                                 break;
-                         case XVID_CURVE_LINEAR: // Linear (medium aggressiveness)
-                                 rc->alt_curve_qual_dev *= 2.0 / (1.0 + avg_pvop / rc->alt_curve_low_diff);
-                                 rc->alt_curve_mid_qual = 1.0 - rc->alt_curve_qual_dev * avg_pvop / rc->alt_curve_low_diff;
-                                 break;
-                         case XVID_CURVE_COSINE: // Cosine Curve (low aggressiveness)
-                                 rc->alt_curve_qual_dev *= 2.0 / (1.0 + (1.0 - cos(DEG2RAD * (avg_pvop * 90.0 / rc->alt_curve_low_diff))));
-                                 rc->alt_curve_mid_qual = 1.0 - rc->alt_curve_qual_dev * (1.0 - cos(DEG2RAD * (avg_pvop * 90.0 / rc->alt_curve_low_diff)));
-                         }
-                 }
-     }
-     /* --- */
+ /* Default buffer size for reading lines */
+ #define BUF_SZ   1024
-     total1=total2=0;
+ /* Helper functions for reading/parsing the stats file */
-     for (i=0; i<rc->num_frames; i++) {
+ static char *skipspaces(char *string);
-         stat_t * s = &rc->stats[i];
+ static int iscomment(char *string);
+ static char *readline(FILE *f);
+ /* This function counts the number of frame entries in the stats file
+  * It also counts the number of I Frames */
+ static int
+ statsfile_count_frames(rc_2pass2_t * rc, char * filename)
+ {
+         FILE * f;
+         char *line;
+         int lines;
-         if (s->type != XVID_TYPE_IVOP) {
+         rc->num_frames = 0;
-             double dbytes,dbytes2;
+         rc->num_keyframes = 0;
-             dbytes = s->scaled_length / rc->movie_curve;
+         if ((f = fopen(filename, "rb")) == NULL)
-             dbytes2 = 0; /* XXX: warning */
+                 return(-1);
-             total1 += dbytes;
-             if (s->type == XVID_TYPE_BVOP)
-                 dbytes *= rc->avg_length[XVID_TYPE_PVOP-1] / rc->avg_length[XVID_TYPE_BVOP-1];
-             if (rc->param.use_alt_curve) {
+         lines = 0;
-                 if (dbytes > rc->avg_length[XVID_TYPE_PVOP-1]) {
+         while ((line = readline(f)) != NULL) {
-                     if (dbytes >= rc->alt_curve_high) {
+                 char *ptr;
-                                                 dbytes2 = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev);
+                 char type;
-                     }else{
+                 int fields;
-                                                 switch(rc->param.alt_curve_type) {
-                         case XVID_CURVE_SINE :
-                                                     dbytes2 = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * sin(DEG2RAD * ((dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) * 90.0 / rc->alt_curve_high_diff)));
-                                                         break;
-                         case XVID_CURVE_LINEAR :
-                                                     dbytes2 = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * (dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) / rc->alt_curve_high_diff);
-                                                         break;
-                                                 case XVID_CURVE_COSINE :
-                                                     dbytes2 = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * (1.0 - cos(DEG2RAD * ((dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) * 90.0 / rc->alt_curve_high_diff))));
-                                                 }
-                                         }
-                 }else{
-                     if (dbytes <= rc->alt_curve_low) {
-                                                 dbytes2 = dbytes;
-                     }else{
-                                                 switch(rc->param.alt_curve_type) {
-                                                 case XVID_CURVE_SINE :
-                                                     dbytes2 = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * sin(DEG2RAD * ((dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) * 90.0 / rc->alt_curve_low_diff)));
-                                                         break;
-                                                 case XVID_CURVE_LINEAR :
-                                                     dbytes2 = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * (dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) / rc->alt_curve_low_diff);
-                                                         break;
-                                                 case XVID_CURVE_COSINE :
-                                                     dbytes2 = dbytes * (rc->alt_curve_mid_qual + rc->alt_curve_qual_dev * (1.0 - cos(DEG2RAD * ((dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) * 90.0 / rc->alt_curve_low_diff))));
-                                                 }
-                                         }
-                 }
+                 lines++;
+                 /* We skip spaces */
+                 ptr = skipspaces(line);
-             }else{
+                 /* Skip coment lines or empty lines */
-                 if (dbytes > rc->avg_length[XVID_TYPE_PVOP-1]) {
+                 if(iscomment(ptr) || *ptr == '\0') {
-                     dbytes2=((double)dbytes + (rc->avg_length[XVID_TYPE_PVOP-1] - dbytes) * rc->param.curve_compression_high / 100.0);
+                         free(line);
-                 }else{
+                         continue;
-                                 dbytes2 = ((double)dbytes + (rc->avg_length[XVID_TYPE_PVOP-1] - dbytes) * rc->param.curve_compression_low / 100.0);
-                 }
              }
-             if (s->type == XVID_TYPE_BVOP) {
+                 /* Read the stat line from buffer */
-                             dbytes2 *= rc->avg_length[XVID_TYPE_BVOP-1] / rc->avg_length[XVID_TYPE_PVOP-1];
+                 fields = sscanf(ptr, "%c", &type);
-                             if (dbytes2 < rc->min_length[XVID_TYPE_BVOP-1])
-                                     dbytes2 = rc->min_length[XVID_TYPE_BVOP-1];
+                 /* Valid stats files have at least 7 fields */
-             }else{
+                 if (fields == 1) {
-                             if (dbytes2 < rc->min_length[XVID_TYPE_PVOP-1])
+                         switch(type) {
-                                     dbytes2 = rc->min_length[XVID_TYPE_PVOP-1];
+                         case 'i':
+                         case 'I':
+                                 rc->num_keyframes++;
+                         case 'p':
+                         case 'P':
+                         case 'b':
+                         case 'B':
+                         case 's':
+                         case 'S':
+                                 rc->num_frames++;
+                                 break;
+                         default:
+                                 DPRINTF(XVID_DEBUG_RC,
+                                                 "[xvid rc] -- WARNING: L%d unknown frame type used (%c).\n",
+                                                 lines, type);
              }
-             total2 += dbytes2;
+                 } else {
+                                 DPRINTF(XVID_DEBUG_RC,
+                                                 "[xvid rc] -- WARNING: L%d misses some stat fields (%d).\n",
+                                                 lines, 7-fields);
          }
+                 /* Free the line buffer */
+                 free(line);
      }
-     rc->curve_comp_scale = total1 / total2;
+         /* We are done with the file */
+         fclose(f);
-     if (!rc->param.use_alt_curve) {
+         return(0);
-         printf("middle frame size for asymmetric curve compression: %i\n",
-             (int)(rc->avg_length[XVID_TYPE_PVOP-1] * rc->curve_comp_scale));
      }
-     if (rc->param.use_alt_curve) {
+ /* open stats file(s) and read into rc->stats array */
-         int bonus_bias = rc->param.alt_curve_bonus_bias;
+ static int
-         int oldquant = 1;
+ statsfile_load(rc_2pass2_t *rc, char * filename)
+ {
+         FILE * f;
+         int processed_entries;
+         /* Opens the file */
+         if ((f = fopen(filename, "rb"))==NULL)
+                 return(-1);
-             if (rc->param.alt_curve_use_auto_bonus_bias)
+         processed_entries = 0;
-                     bonus_bias = rc->param.alt_curve_min_rel_qual;
+         while(processed_entries < rc->num_frames) {
+                 char type;
+                 int fields;
+                 twopass_stat_t * s = &rc->stats[processed_entries];
+                 char *line, *ptr;
-             rc->alt_curve_curve_bias_bonus = (total1 - total2) * (double)bonus_bias / 100.0 / (double)(rc->num_frames /* - credits_frames */ - rc->num_keyframes);
+                 /* Read the line from the file */
-             rc->curve_comp_scale = ((total1 - total2) * (1.0 - (double)bonus_bias / 100.0) + total2) / total2;
+                 if((line = readline(f)) == NULL)
+                         break;
+                 /* We skip spaces */
+                 ptr = skipspaces(line);
-         /* special info for alt curve:  bias bonus and quantizer thresholds */
+                 /* Skip comment lines or empty lines */
+                 if(iscomment(ptr) || *ptr == '\0') {
+                         free(line);
+                         continue;
+                 }
-                 printf("avg scaled framesize:%i", (int)rc->avg_length[XVID_TYPE_PVOP-1]);
+                 /* Reset this field that is optional */
-                 printf("bias bonus:%i bytes", (int)rc->alt_curve_curve_bias_bonus);
+                 s->scaled_length = 0;
-                 for (i=1; i <= (int)(rc->alt_curve_high*2)+1; i++) {
+                 /* Convert the fields */
-             double curve_temp, dbytes;
+                 fields = sscanf(ptr,
-             int newquant;
+                                                 "%c %d %d %d %d %d %d %d\n",
+                                                 &type,
+                                                 &s->quant,
+                                                 &s->blks[0], &s->blks[1], &s->blks[2],
+                                                 &s->length, &s->invariant /* not really yet */,
+                                                 &s->scaled_length);
+                 /* Free line buffer, we don't need it anymore */
+                 free(line);
+                 /* Fail silently, this has probably been warned in
+                  * statsfile_count_frames */
+                 if(fields != 7 && fields != 8)
+                         continue;
-             dbytes = i;
+                 /* Convert frame type and compute the invariant length part */
-                         if (dbytes > rc->avg_length[XVID_TYPE_PVOP-1]) {
+                 switch(type) {
-                 if (dbytes >= rc->alt_curve_high) {
+                 case 'i':
-                                         curve_temp = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev);
+                 case 'I':
-                 }else{
+                         s->type = XVID_TYPE_IVOP;
-                                         switch(rc->param.alt_curve_type)
+                         s->invariant /= INVARIANT_HEADER_PART_IVOP;
-                                         {
-                                         case XVID_CURVE_SINE :
-                                                 curve_temp = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * sin(DEG2RAD * ((dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) * 90.0 / rc->alt_curve_high_diff)));
-                                                 break;
-                                         case XVID_CURVE_LINEAR :
-                                                 curve_temp = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * (dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) / rc->alt_curve_high_diff);
                                                  break;
-                                         case XVID_CURVE_COSINE :
+                 case 'p':
-                                                 curve_temp = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * (1.0 - cos(DEG2RAD * ((dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) * 90.0 / rc->alt_curve_high_diff))));
+                 case 'P':
-                                         }
+                 case 's':
-                                 }
+                 case 'S':
-                         }else{
+                         s->type = XVID_TYPE_PVOP;
-                 if (dbytes <= rc->alt_curve_low) {
+                         s->invariant /= INVARIANT_HEADER_PART_PVOP;
-                                         curve_temp = dbytes;
-                 }else{
-                                         switch(rc->param.alt_curve_type)
-                                         {
-                                         case XVID_CURVE_SINE :
-                                                 curve_temp = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * sin(DEG2RAD * ((dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) * 90.0 / rc->alt_curve_low_diff)));
                                                  break;
-                                         case XVID_CURVE_LINEAR :
+                 case 'b':
-                                                 curve_temp = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * (dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) / rc->alt_curve_low_diff);
+                 case 'B':
+                         s->type = XVID_TYPE_BVOP;
+                         s->invariant /= INVARIANT_HEADER_PART_BVOP;
                                                  break;
-                                         case XVID_CURVE_COSINE :
+                 default:
-                                                 curve_temp = dbytes * (rc->alt_curve_mid_qual + rc->alt_curve_qual_dev * (1.0 - cos(DEG2RAD * ((dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) * 90.0 / rc->alt_curve_low_diff))));
+                         /* Same as before, fail silently */
-                                         }
+                         continue;
-                                 }
                          }
-                         if (rc->movie_curve > 1.0)
+                 /* Ok it seems it's been processed correctly */
-                                 dbytes *= rc->movie_curve;
+                 processed_entries++;
-                         newquant = (int)(dbytes * 2.0 / (curve_temp * rc->curve_comp_scale + rc->alt_curve_curve_bias_bonus));
-                         if (newquant > 1) {
-                                 if (newquant != oldquant) {
-                     int percent = (int)((i - rc->avg_length[XVID_TYPE_PVOP-1]) * 100.0 / rc->avg_length[XVID_TYPE_PVOP-1]);
-                                         oldquant = newquant;
-                                         printf("quant:%i threshold at %i : %i percent", newquant, i, percent);
-                                 }
-                         }
                  }
-     }
+         /* Close the file */
+         fclose(f);
-     rc->overflow = 0;
+         return(0);
-     rc->KFoverflow = 0;
-     rc->KFoverflow_partial = 0;
-     rc->KF_idx = 1;
  }
+ /* pre-process the statistics data
+  * - for each type, count, tot_length, min_length, max_length
+  * - set keyframes_locations, tot_prescaled */
- static int rc_2pass2_create(xvid_plg_create_t * create, rc_2pass2_t ** handle)
+ static void
+ first_pass_stats_prepare_data(rc_2pass2_t * rc)
  {
-     xvid_plugin_2pass2_t * param = (xvid_plugin_2pass2_t *)create->param;
+         int i,j;
-     rc_2pass2_t * rc;
-     rc = malloc(sizeof(rc_2pass2_t));
-     if (rc == NULL)
-         return XVID_ERR_MEMORY;
-     rc->param = *param;
-     if (rc->param.keyframe_boost <= 0) rc->param.keyframe_boost = 0;
-     if (rc->param.payback_method <= 0) rc->param.payback_method = XVID_PAYBACK_PROP;
-     if (rc->param.bitrate_payback_delay <= 0) rc->param.bitrate_payback_delay = 250;
-     if (rc->param.curve_compression_high <= 0) rc->param.curve_compression_high = 0;
-     if (rc->param.curve_compression_low <= 0) rc->param.curve_compression_low = 0;
-     if (rc->param.max_overflow_improvement <= 0) rc->param.max_overflow_improvement = 60;
-     if (rc->param.max_overflow_degradation <= 0) rc->param.max_overflow_degradation = 60;
-     if (rc->param.min_quant[0] <= 0) rc->param.min_quant[0] = 2;
-     if (rc->param.max_quant[0] <= 0) rc->param.max_quant[0] = 31;
-     if (rc->param.min_quant[1] <= 0) rc->param.min_quant[1] = 2;
-     if (rc->param.max_quant[1] <= 0) rc->param.max_quant[1] = 31;
-     if (rc->param.min_quant[2] <= 0) rc->param.min_quant[2] = 2;
-     if (rc->param.max_quant[2] <= 0) rc->param.max_quant[2] = 31;
-     if (rc->param.use_alt_curve <= 0) rc->param.use_alt_curve = 0;
-     if (rc->param.alt_curve_high_dist <= 0) rc->param.alt_curve_high_dist = 500;
-     if (rc->param.alt_curve_low_dist <= 0) rc->param.alt_curve_low_dist = 90;
-     if (rc->param.alt_curve_use_auto <= 0) rc->param.alt_curve_use_auto = 1;
-     if (rc->param.alt_curve_auto_str <= 0) rc->param.alt_curve_auto_str = 30;
-     if (rc->param.alt_curve_type <= 0) rc->param.alt_curve_type = XVID_CURVE_LINEAR;
-     if (rc->param.alt_curve_min_rel_qual <= 0) rc->param.alt_curve_min_rel_qual = 50;
-     if (rc->param.alt_curve_use_auto_bonus_bias <= 0) rc->param.alt_curve_use_auto_bonus_bias = 1;
-     if (rc->param.alt_curve_bonus_bias <= 0) rc->param.alt_curve_bonus_bias = 50;
-     if (rc->param.kftreshold <= 0) rc->param.kftreshold = 10;
-     if (rc->param.kfreduction <= 0) rc->param.kfreduction = 20;
-     if (rc->param.min_key_interval <= 0) rc->param.min_key_interval = 300;
-     if (!det_stats_length(rc, param->filename)){
-         DPRINTF(DPRINTF_RC,"fopen %s failed\n", param->filename);
-         free(rc);
-         return XVID_ERR_FAIL;
-     }
-     if ((rc->stats = malloc(rc->num_frames * sizeof(stat_t))) == NULL) {
+         /* *rc fields initialization
-         free(rc);
+          * NB: INT_MAX and INT_MIN are used in order to be immediately replaced
-         return XVID_ERR_MEMORY;
+          *     with real values of the 1pass */
+         for (i=0; i<3; i++) {
+                 rc->count[i]=0;
+                 rc->tot_length[i] = 0;
+                 rc->tot_invariant[i] = 0;
+                 rc->min_length[i] = INT_MAX;
      }
-     /* XXX: do we need an addition location */
+         rc->max_length = INT_MIN;
-     if ((rc->keyframe_locations = malloc((rc->num_keyframes + 1) * sizeof(int))) == NULL) {
+         rc->tot_weighted = 0;
-         free(rc->stats);
-         free(rc);
-         return XVID_ERR_MEMORY;
-     }
-     if (!load_stats(rc, param->filename)) {
+         /* Loop through all frames and find/compute all the stuff this function
-         DPRINTF(DPRINTF_RC,"fopen %s failed\n", param->filename);
+          * is supposed to do */
-         free(rc->keyframe_locations);
+         for (i=j=0; i<rc->num_frames; i++) {
-         free(rc->stats);
+                 twopass_stat_t * s = &rc->stats[i];
-         free(rc);
-         return XVID_ERR_FAIL;
-     }
-     /* pre-process our stats */
+                 rc->count[s->type-1]++;
+                 rc->tot_length[s->type-1] += s->length;
+                 rc->tot_invariant[s->type-1] += s->invariant;
+                 if (s->zone_mode != XVID_ZONE_QUANT)
+                         rc->tot_weighted += (int)(s->weight*(s->length - s->invariant));
-         {
+                 if (s->length < rc->min_length[s->type-1]) {
-                 if (rc->num_frames  < create->fbase/create->fincr) {
+                         rc->min_length[s->type-1] = s->length;
-                         rc->target = rc->param.bitrate / 8;     /* one second */
-                 }else{
-                         rc->target = (rc->param.bitrate * rc->num_frames * create->fincr) / (create->fbase * 8);
                  }
+                 if (s->length > rc->max_length) {
-                 rc->target -= rc->num_frames*24;        /* avi file header */
+                         rc->max_length = s->length;
          }
+                 if (s->type == XVID_TYPE_IVOP) {
-         pre_process0(rc);
+                         rc->keyframe_locations[j] = i;
-         if (rc->param.bitrate) {
+                         j++;
-                 internal_scale(rc);
          }
-         pre_process1(rc);pre_process1(rc);pre_process1(rc);
-     *handle = rc;
-         return(0);
  }
+         /* NB:
+          * The "per sequence" overflow system considers a natural sequence to be
+          * formed by all frames between two iframes, so if we want to make sure
+          * the system does not go nuts during last sequence, we force the last
+          * frame to appear in the keyframe locations array. */
+         rc->keyframe_locations[j] = i;
- static int rc_2pass2_destroy(rc_2pass2_t * rc, xvid_plg_destroy_t * destroy)
+         DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- Min 1st pass IFrame length: %d\n", rc->min_length[0]);
- {
+         DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- Min 1st pass PFrame length: %d\n", rc->min_length[1]);
-     free(rc->keyframe_locations);
+         DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- Min 1st pass BFrame length: %d\n", rc->min_length[2]);
-     free(rc->stats);
-         free(rc);
-         return(0);
  }
+ /* calculate zone weight "center" */
+ static void
- static int rc_2pass2_before(rc_2pass2_t * rc, xvid_plg_data_t * data)
+ zone_process(rc_2pass2_t *rc, const xvid_plg_create_t * create)
  {
-     stat_t * s = &rc->stats[data->frame_num];
+         int i,j;
-     int overflow;
+         int n = 0;
-     int desired;
-     double dbytes;
-     double curve_temp;
-     int capped_to_max_framesize = 0;
-     if (data->frame_num >= rc->num_frames) {
-         /* insufficent stats data */
-         return 0;
-     }
-     overflow = rc->overflow / 8;        /* XXX: why by 8 */
+         rc->tot_quant = 0;
+         rc->tot_quant_invariant = 0;
-     if (s->type == XVID_TYPE_IVOP) {        /* XXX: why */
+         if (create->num_zones == 0) {
-         overflow = 0;
+                 for (j = 0; j < rc->num_frames; j++) {
+                         rc->stats[j].zone_mode = XVID_ZONE_WEIGHT;
+                         rc->stats[j].weight = 1.0;
+                 }
+                 n += rc->num_frames;
      }
-     desired = s->scaled_length;
-     dbytes = desired;
+         for(i=0; i < create->num_zones; i++) {
-     if (s->type == XVID_TYPE_IVOP) {
-         dbytes += desired * rc->param.keyframe_boost / 100;
-     }
-     dbytes /= rc->movie_curve;
-     if (s->type == XVID_TYPE_BVOP) {
+                 int next = (i+1<create->num_zones) ? create->zones[i+1].frame : rc->num_frames;
-         dbytes *= rc->avg_length[XVID_TYPE_PVOP-1] / rc->avg_length[XVID_TYPE_BVOP-1];
-     }
-     if (rc->param.payback_method == XVID_PAYBACK_BIAS) {
+                 /* Zero weight make no sense */
-         desired =(int)(rc->curve_comp_error / rc->param.bitrate_payback_delay);
+                 if (create->zones[i].increment == 0) create->zones[i].increment = 1;
-     }else{
+                 /* And obviously an undetermined infinite makes even less sense */
-                 //printf("desired=%i, dbytes=%i\n", desired,dbytes);
+                 if (create->zones[i].base == 0) create->zones[i].base = 1;
-                 desired = (int)(rc->curve_comp_error * dbytes /
-                         rc->avg_length[XVID_TYPE_PVOP-1] / rc->param.bitrate_payback_delay);
-                 //printf("desired=%i\n", desired);
-                 if (labs(desired) > fabs(rc->curve_comp_error)) {
+                 if (i==0 && create->zones[i].frame > 0) {
-                         desired = (int)rc->curve_comp_error;
+                         for (j = 0; j < create->zones[i].frame && j < rc->num_frames; j++) {
+                                 rc->stats[j].zone_mode = XVID_ZONE_WEIGHT;
+                                 rc->stats[j].weight = 1.0;
                  }
+                         n += create->zones[i].frame;
      }
-     rc->curve_comp_error -= desired;
+                 if (create->zones[i].mode == XVID_ZONE_WEIGHT) {
+                         for (j = create->zones[i].frame; j < next && j < rc->num_frames; j++ ) {
-     /* alt curve */
+                                 rc->stats[j].zone_mode = XVID_ZONE_WEIGHT;
+                                 rc->stats[j].weight = (double)create->zones[i].increment / (double)create->zones[i].base;
-     curve_temp = 0; /* XXX: warning */
-     if (rc->param.use_alt_curve) {
-         if (s->type != XVID_TYPE_IVOP)  {
-             if (dbytes > rc->avg_length[XVID_TYPE_PVOP-1]) {
-                 if (dbytes >= rc->alt_curve_high) {
-                                         curve_temp = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev);
-                 }else{
-                     switch(rc->param.alt_curve_type) {
-                                         case XVID_CURVE_SINE :
-                                             curve_temp = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * sin(DEG2RAD * ((dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) * 90.0 / rc->alt_curve_high_diff)));
-                                                 break;
-                                         case XVID_CURVE_LINEAR :
-                                             curve_temp = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * (dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) / rc->alt_curve_high_diff);
-                                                 break;
-                                         case XVID_CURVE_COSINE :
-                                             curve_temp = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * (1.0 - cos(DEG2RAD * ((dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) * 90.0 / rc->alt_curve_high_diff))));
                                          }
+                         next -= create->zones[i].frame;
+                         n += next;
+                 } else{  /* XVID_ZONE_QUANT */
+                         for (j = create->zones[i].frame; j < next && j < rc->num_frames; j++ ) {
+                                 rc->stats[j].zone_mode = XVID_ZONE_QUANT;
+                                 rc->stats[j].weight = (double)create->zones[i].increment / (double)create->zones[i].base;
+                                 rc->tot_quant += rc->stats[j].length;
+                                 rc->tot_quant_invariant += rc->stats[j].invariant;
                                  }
-                         }else{
-                 if (dbytes <= rc->alt_curve_low){
-                                         curve_temp = dbytes;
-                 }else{
-                                         switch(rc->param.alt_curve_type) {
-                                         case XVID_CURVE_SINE :
-                                             curve_temp = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * sin(DEG2RAD * ((dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) * 90.0 / rc->alt_curve_low_diff)));
-                                                 break;
-                                         case XVID_CURVE_LINEAR :
-                                             curve_temp = dbytes * (rc->alt_curve_mid_qual - rc->alt_curve_qual_dev * (dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) / rc->alt_curve_low_diff);
-                                                 break;
-                                         case XVID_CURVE_COSINE :
-                                             curve_temp = dbytes * (rc->alt_curve_mid_qual + rc->alt_curve_qual_dev * (1.0 - cos(DEG2RAD * ((dbytes - rc->avg_length[XVID_TYPE_PVOP-1]) * 90.0 / rc->alt_curve_low_diff))));
                      }
                                  }
                          }
-                         if (s->type == XVID_TYPE_BVOP)
-                                 curve_temp *= rc->avg_length[XVID_TYPE_BVOP-1] / rc->avg_length[XVID_TYPE_PVOP-1];
-                         curve_temp = curve_temp * rc->curve_comp_scale + rc->alt_curve_curve_bias_bonus;
-                         desired += ((int)curve_temp);
-                         rc->curve_comp_error += curve_temp - (int)curve_temp;
-                 }else{
-                         if (s->type == XVID_TYPE_BVOP)
-                                 dbytes *= rc->avg_length[XVID_TYPE_BVOP-1] / rc->avg_length[XVID_TYPE_PVOP-1];
-                         desired += ((int)dbytes);
+ /* scale the curve */
-                         rc->curve_comp_error += dbytes - (int)dbytes;
+ static void
-                 }
+ first_pass_scale_curve_internal(rc_2pass2_t *rc)
+ {
+         int64_t target;
+         int64_t total_invariant;
+         double scaler;
+         int i, num_MBs;
-     }else if ((rc->param.curve_compression_high + rc->param.curve_compression_low) &&   s->type != XVID_TYPE_IVOP) {
+         /* We only scale texture data ! */
+         total_invariant  = rc->tot_invariant[XVID_TYPE_IVOP-1];
+         total_invariant += rc->tot_invariant[XVID_TYPE_PVOP-1];
+         total_invariant += rc->tot_invariant[XVID_TYPE_BVOP-1];
+         /* don't forget to substract header bytes used in quant zones, otherwise we
+          * counting them twice */
+         total_invariant -= rc->tot_quant_invariant;
+         /* We remove the bytes used by the fixed quantizer zones during first pass
+          * with the same quants, so we know very precisely how much that
+          * represents */
+         target  = rc->target;
+         target -= rc->tot_quant;
+         /* Let's compute a linear scaler in order to perform curve scaling */
+         scaler = (double)(target - total_invariant) / (double)(rc->tot_weighted);
+ #ifdef SMART_OVERFLOW_SETTING
+         if (scaler > 0.9) {
+                 rc->param.max_overflow_degradation *= 5;
+                 rc->param.max_overflow_improvement *= 5;
+                 rc->param.overflow_control_strength *= 3;
+         } else if (scaler > 0.6) {
+                 rc->param.max_overflow_degradation *= 2;
+                 rc->param.max_overflow_improvement *= 2;
+                 rc->param.overflow_control_strength *= 2;
+         } else {
+                 rc->min_quant = 2;
+         }
+ #endif
+         /* Compute min frame lengths (for each frame type) according to the number
+          * of MBs. We sum all block type counters of frame 0, this gives us the
+          * number of MBs.
+          *
+          * We compare these hardcoded values with observed values in first pass
+          * (determined in pre_process0).Then we keep the real minimum. */
-         curve_temp = rc->curve_comp_scale;
+         /* Number of MBs */
-         if (dbytes > rc->avg_length[XVID_TYPE_PVOP-1]) {
+         num_MBs  = rc->stats[0].blks[0];
-             curve_temp *= ((double)dbytes + (rc->avg_length[XVID_TYPE_PVOP-1] - dbytes) * rc->param.curve_compression_high / 100.0);
+         num_MBs += rc->stats[0].blks[1];
-         } else {
+         num_MBs += rc->stats[0].blks[2];
-             curve_temp *= ((double)dbytes + (rc->avg_length[XVID_TYPE_PVOP-1] - dbytes) * rc->param.curve_compression_low / 100.0);
-         }
+         /* Minimum for I frames */
+         if(rc->min_length[XVID_TYPE_IVOP-1] > ((num_MBs*22) + 240) / 8)
+                 rc->min_length[XVID_TYPE_IVOP-1] = ((num_MBs*22) + 240) / 8;
+         /* Minimum for P/S frames */
+         if(rc->min_length[XVID_TYPE_PVOP-1] > ((num_MBs) + 88)  / 8)
+                 rc->min_length[XVID_TYPE_PVOP-1] = ((num_MBs) + 88)  / 8;
+         /* Minimum for B frames */
+         if(rc->min_length[XVID_TYPE_BVOP-1] > 8)
+                 rc->min_length[XVID_TYPE_BVOP-1] = 8;
-         if (s->type == XVID_TYPE_BVOP){
+         /* Perform an initial scale pass.
-             curve_temp *= rc->avg_length[XVID_TYPE_BVOP-1] / rc->avg_length[XVID_TYPE_PVOP-1];
+          *
-         }
+          * If a frame size is scaled underneath our hardcoded minimums, then we
+          * force the frame size to the minimum, and deduct the original & scaled
+          * frame length from the original and target total lengths */
+         for (i=0; i<rc->num_frames; i++) {
+                 twopass_stat_t * s = &rc->stats[i];
+                 int len;
-         desired += (int)curve_temp;
+                 /* No need to scale frame length for which a specific quantizer is
-         rc->curve_comp_error += curve_temp - (int)curve_temp;
+                  * specified thanks to zones */
-     }else{
+                 if (s->zone_mode == XVID_ZONE_QUANT) {
-         if (s->type == XVID_TYPE_BVOP){
+                         s->scaled_length = s->length;
-                         dbytes *= rc->avg_length[XVID_TYPE_BVOP-1] / rc->avg_length[XVID_TYPE_PVOP-1];
+                         continue;
          }
-                 desired += (int)dbytes;
+                 /* Compute the scaled length -- only non invariant data length is scaled */
-                 rc->curve_comp_error += dbytes - (int)dbytes;
+                 len = s->invariant + (int)((double)(s->length-s->invariant) * scaler * s->weight);
-     }
-         if (desired > s->length){
+                 /* Compare with the computed minimum */
-                 rc->curve_comp_error += desired - s->length;
+                 if (len < rc->min_length[s->type-1]) {
-                 desired = s->length;
+                         /* This is a 'forced size' frame, set its frame size to the
+                          * computed minimum */
+                         s->scaled_length = rc->min_length[s->type-1];
+                         /* Remove both scaled and original size from their respective
+                          * total counters, as we prepare a second pass for 'regular'
+                          * frames */
+                         target -= s->scaled_length;
          }else{
-         if (desired < rc->min_length[s->type-1]) {
+                         /* Do nothing for now, we'll scale this later */
-             if (s->type == XVID_TYPE_IVOP){
+                         s->scaled_length = 0;
-                 rc->curve_comp_error -= rc->min_length[XVID_TYPE_IVOP-1] - desired;
              }
-             desired = rc->min_length[s->type-1];
          }
+         /* The first pass on data substracted all 'forced size' frames from the
+          * total counters. Now, it's possible to scale the 'regular' frames. */
+         /* Scaling factor for 'regular' frames */
+         scaler = (double)(target - total_invariant) / (double)(rc->tot_weighted);
+         /* Do another pass with the new scaler */
+         for (i=0; i<rc->num_frames; i++) {
+                 twopass_stat_t * s = &rc->stats[i];
+                 /* Ignore frame with forced frame sizes */
+                 if (s->scaled_length == 0)
+                         s->scaled_length = s->invariant + (int)((double)(s->length-s->invariant) * scaler * s->weight);
          }
-     s->desired_length = desired;
+         /* Job done */
+         return;
+ }
+ /* Apply all user settings to the scaled curve
+  * This implies:
+  *   keyframe boosting
+  *   high/low compression */
+ static void
+ scaled_curve_apply_advanced_parameters(rc_2pass2_t * rc)
+ {
+         int i;
+         int64_t ivop_boost_total;
-     /* if this keyframe is too close to the next, reduce it's byte allotment
+         /* Reset the rate controller (per frame type) total byte counters */
-     XXX: why do we do this after setting the desired length  */
+         for (i=0; i<3; i++) rc->tot_scaled_length[i] = 0;
-         if (s->type == XVID_TYPE_IVOP) {
+         /* Compute total bytes for each frame type */
-                 int KFdistance = rc->keyframe_locations[rc->KF_idx] - rc->keyframe_locations[rc->KF_idx - 1];
+         for (i=0; i<rc->num_frames;i++) {
+                 twopass_stat_t *s = &rc->stats[i];
+                 rc->tot_scaled_length[s->type-1] += s->scaled_length;
+         }
-         if (KFdistance < rc->param.kftreshold) {
+         /* First we compute the total amount of bits needed, as being described by
+          * the scaled distribution. During this pass over the complete stats data,
+          * we see how much bits two user settings will get/give from/to p&b frames:
+          *  - keyframe boosting
+          *  - keyframe distance penalty */
+         rc->KF_idx = 0;
+         ivop_boost_total = 0;
+         for (i=0; i<rc->num_frames; i++) {
+                 twopass_stat_t * s = &rc->stats[i];
-             KFdistance = KFdistance - rc->param.min_key_interval;
+                 /* Some more work is needed for I frames */
+                 if (s->type == XVID_TYPE_IVOP) {
+                         int ivop_boost;
-                         if (KFdistance >= 0) {
+                         /* Accumulate bytes needed for keyframe boosting */
-                 int KF_min_size;
+                         ivop_boost = s->scaled_length*rc->param.keyframe_boost/100;
-                                 KF_min_size = desired * (100 - rc->param.kfreduction) / 100;
+ #if 0 /* ToDo: decide how to apply kfthresholding */
-                                 if (KF_min_size < 1)
+ #endif
-                                         KF_min_size = 1;
+                         /* If the frame size drops under the minimum length, then cap ivop_boost */
+                         if (ivop_boost + s->scaled_length < rc->min_length[XVID_TYPE_IVOP-1])
+                                 ivop_boost = rc->min_length[XVID_TYPE_IVOP-1] - s->scaled_length;
-                                 desired = KF_min_size + (desired - KF_min_size) * KFdistance /
+                         /* Accumulate the ivop boost */
-                                         (rc->param.kftreshold - rc->param.min_key_interval);
+                         ivop_boost_total += ivop_boost;
-                                 if (desired < 1)
+                         /* Don't forget to update the keyframe index */
-                                         desired = 1;
+                         rc->KF_idx++;
-                         }
                  }
          }
-     overflow = (int)((double)overflow * desired / rc->avg_length[XVID_TYPE_PVOP-1]);
+         /* Initialize the IBoost tax ratio for P/S/B frames
+          *
+          * This ratio has to be applied to p/b/s frames in order to reserve
+          * additional bits for keyframes (keyframe boosting) or if too much
+          * keyframe distance is applied, bits retrieved from the keyframes.
+          *
+          * ie pb_length *= rc->pb_iboost_tax_ratio;
+          *
+          *    gives the ideal length of a p/b frame */
+         /* Compute the total length of p/b/s frames (temporary storage into
+          * movie_curve) */
+         rc->pb_iboost_tax_ratio  = (double)rc->tot_scaled_length[XVID_TYPE_PVOP-1];
+         rc->pb_iboost_tax_ratio += (double)rc->tot_scaled_length[XVID_TYPE_BVOP-1];
+         /* Compute the ratio described above
+          *     taxed_total = sum(0, n, tax*scaled_length)
+          * <=> taxed_total = tax.sum(0, n, scaled_length)
+          * <=> tax = taxed_total / original_total */
+         rc->pb_iboost_tax_ratio =
+                 (rc->pb_iboost_tax_ratio - ivop_boost_total) /
+                 rc->pb_iboost_tax_ratio;
-         // Foxer: reign in overflow with huge frames
+         DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- IFrame boost tax ratio:%.2f\n",
-         if (labs(overflow) > labs(rc->overflow)) {
+                         rc->pb_iboost_tax_ratio);
-                 overflow = rc->overflow;
-         }
-     // Foxer: make sure overflow doesn't run away
+         /* Compute the average size of frames per frame type */
+         for(i=0; i<3; i++) {
+                 /* Special case for missing type or weird case */
+                 if (rc->count[i] == 0 || rc->pb_iboost_tax_ratio == 0) {
+                         rc->avg_length[i] = 1;
+                 } else {
+                         rc->avg_length[i] = rc->tot_scaled_length[i];
-         if (overflow > desired * rc->param.max_overflow_improvement / 100) {
+                         if (i == (XVID_TYPE_IVOP-1)) {
-                 desired += (overflow <= desired) ? desired * rc->param.max_overflow_improvement / 100 :
+                                 /* I Frames total has to be added the boost total */
-                         overflow * rc->param.max_overflow_improvement / 100;
+                                 rc->avg_length[i] += ivop_boost_total;
-         }else if (overflow < desired * rc->param.max_overflow_degradation / -100){
-                 desired += desired * rc->param.max_overflow_degradation / -100;
          }else{
-                 desired += overflow;
+                                 /* P/B frames has to taxed */
+                                 rc->avg_length[i] *= rc->pb_iboost_tax_ratio;
          }
-     if (desired > rc->max_length) {
+                         /* Finally compute the average frame size */
-                 capped_to_max_framesize = 1;
+                         rc->avg_length[i] /= (double)rc->count[i];
-                 desired = rc->max_length;
          }
-     // make sure to not scale below the minimum framesize
-     if (desired < rc->min_length[s->type-1]) {
-         desired = rc->min_length[s->type-1];
      }
+         /* Assymetric curve compression */
+         if (rc->param.curve_compression_high || rc->param.curve_compression_low) {
+                 double symetric_total;
+                 double assymetric_delta_total;
-     // very 'simple' quant<->filesize relationship
+                 /* Like I frame boosting, assymetric curve compression modifies the total
-     data->quant= (s->quant * s->length) / desired;
+                  * amount of needed bits, we must compute the ratio so we can prescale
+                  lengths */
-         if (data->quant < 1) {
+                 symetric_total = 0;
-                 data->quant = 1;
+                 assymetric_delta_total = 0;
-     } else if (data->quant > 31) {
+                 for (i=0; i<rc->num_frames; i++) {
-                 data->quant = 31;
+                         double assymetric_delta;
-         }
+                         double dbytes;
-         else if (s->type != XVID_TYPE_IVOP)
+                         twopass_stat_t * s = &rc->stats[i];
-         {
-                 // Foxer: aid desired quantizer precision by accumulating decision error
-                 if (s->type== XVID_TYPE_BVOP) {
-                         rc->bquant_error[data->quant] += ((double)(s->quant * s->length) / desired) - data->quant;
-                         if (rc->bquant_error[data->quant] >= 1.0) {
+                         /* I Frames are not concerned by assymetric scaling */
-                                 rc->bquant_error[data->quant] -= 1.0;
+                         if (s->type == XVID_TYPE_IVOP)
-                                 data->quant++;
+                                 continue;
-                         }
-                 }else{
-                         rc->pquant_error[data->quant] += ((double)(s->quant * s->length) / desired) - data->quant;
-             if (rc->pquant_error[data->quant] >= 1.0) {
+                         /* During the real run, we would have to apply the iboost tax */
-                                 rc->pquant_error[data->quant] -= 1.0;
+                         dbytes = s->scaled_length * rc->pb_iboost_tax_ratio;
-                                 ++data->quant;
-                         }
-                 }
-         }
-     /* cap to min/max quant */
+                         /* Update the symmetric curve compression total */
+                         symetric_total += dbytes;
-     if (data->quant < rc->param.min_quant[s->type-1]) {
+                         /* Apply assymetric curve compression */
-         data->quant = rc->param.min_quant[s->type-1];
+                         if (dbytes > rc->avg_length[s->type-1])
-     }else if (data->quant > rc->param.max_quant[s->type-1]) {
+                                 assymetric_delta = (rc->avg_length[s->type-1] - dbytes) * (double)rc->param.curve_compression_high / 100.0f;
-         data->quant = rc->param.max_quant[s->type-1];
+                         else
-     }
+                                 assymetric_delta = (rc->avg_length[s->type-1] - dbytes) * (double)rc->param.curve_compression_low  / 100.0f;
-     /* subsequent p/b frame quants can only be +- 2 */
+                         /* Cap to the minimum frame size if needed */
-         if (s->type != XVID_TYPE_IVOP && rc->last_quant[s->type-1] && capped_to_max_framesize == 0) {
+                         if (dbytes + assymetric_delta < rc->min_length[s->type-1])
+                                 assymetric_delta = rc->min_length[s->type-1] - dbytes;
-                 if (data->quant > rc->last_quant[s->type-1] + 2) {
+                         /* Accumulate after assymetric curve compression */
-                         data->quant = rc->last_quant[s->type-1] + 2;
+                         assymetric_delta_total += assymetric_delta;
-                         DPRINTF(DPRINTF_RC, "p/b-frame quantizer prevented from rising too steeply");
-                 }
-                 if (data->quant < rc->last_quant[s->type-1] - 2) {
-                         data->quant = rc->last_quant[s->type-1] - 2;
-                         DPRINTF(DPRINTF_RC, "p/b-frame quantizer prevented from falling too steeply");
-                 }
          }
-         if (capped_to_max_framesize == 0) {
+                 /* Compute the tax that all p/b frames have to pay in order to respect the
-         rc->last_quant[s->type-1] = data->quant;
+                  * bit distribution changes that the assymetric compression curve imposes
+                  * We want assymetric_total = sum(0, n-1, tax.scaled_length)
+                  *      ie assymetric_total = ratio.sum(0, n-1, scaled_length)
+                  *         ratio = assymetric_total / symmetric_total */
+                 rc->assymetric_tax_ratio = ((double)symetric_total - (double)assymetric_delta_total) / (double)symetric_total;
+         } else {
+                 rc->assymetric_tax_ratio = 1.0f;
          }
-         return 0;
+         DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- Assymetric tax ratio:%.2f\n", rc->assymetric_tax_ratio);
- }
+         /* Last bits that need to be reset */
+         rc->overflow = 0;
+         rc->KFoverflow = 0;
+         rc->KFoverflow_partial = 0;
+         rc->KF_idx = 0;
+         rc->desired_total = 0;
+         rc->real_total = 0;
+         /* Job done */
+         return;
+ }
- static int rc_2pass2_after(rc_2pass2_t * rc, xvid_plg_data_t * data)
+ /*****************************************************************************
+  * Still more low level stuff (nothing to do with stats treatment)
+  ****************************************************************************/
+ /* This function returns an allocated string containing a complete line read
+  * from the file starting at the current position */
+ static char *
+ readline(FILE *f)
  {
-     stat_t * s = &rc->stats[data->frame_num];
+         char *buffer = NULL;
+         int buffer_size = 0;
-     if (data->frame_num >= rc->num_frames) {
+         int pos = 0;
-         /* insufficent stats data */
-         return 0;
-     }
-     rc->quant_count[data->quant]++;
+         do {
+                 int c;
-     if (data->type == XVID_TYPE_IVOP) {
+                 /* Read a character from the stream */
-         int kfdiff = (rc->keyframe_locations[rc->KF_idx] -      rc->keyframe_locations[rc->KF_idx - 1]);
+                 c = fgetc(f);
-         rc->overflow += rc->KFoverflow;
+                 /* Is that EOF or new line ? */
-         rc->KFoverflow = s->desired_length - data->length;
+                 if(c == EOF || c == '\n')
+                         break;
-         if (kfdiff > 1) {  // non-consecutive keyframes
+                 /* Do we have to update buffer ? */
-             rc->KFoverflow_partial = rc->KFoverflow / (kfdiff - 1);
+                 if(pos >= buffer_size - 1) {
-         }else{ // consecutive keyframes
+                         buffer_size += BUF_SZ;
-                         rc->overflow += rc->KFoverflow;
+                         buffer = (char*)realloc(buffer, buffer_size);
-                         rc->KFoverflow = 0;
+                         if (buffer == NULL)
-                         rc->KFoverflow_partial = 0;
+                                 return(NULL);
-         }
-         rc->KF_idx++;
-     }else{
-         // distribute part of the keyframe overflow
-         rc->overflow += s->desired_length - data->length + rc->KFoverflow_partial;
-         rc->KFoverflow -= rc->KFoverflow_partial;
      }
-     printf("[%i] quant:%i stats1:%i scaled:%i actual:%i overflow:%i\n",
+                 buffer[pos] = c;
-         data->frame_num,
+                 pos++;
-         data->quant,
+         } while(1);
-         s->length,
-         s->scaled_length,
-         data->length,
-         rc->overflow);
-     return(0);
+         /* Read \n or EOF */
+         if (buffer == NULL) {
+                 /* EOF, so we reached the end of the file, return NULL */
+                 if(feof(f))
+                         return(NULL);
+                 /* Just an empty line with just a newline, allocate a 1 byte buffer to
+                  * store a zero length string */
+                 buffer = (char*)malloc(1);
+                 if(buffer == NULL)
+                         return(NULL);
  }
+         /* Zero terminated string */
+         buffer[pos] = '\0';
+         return(buffer);
+ }
- int xvid_plugin_2pass2(void * handle, int opt, void * param1, void * param2)
+ /* This function returns a pointer to the first non space char in the given
+  * string */
+ static char *
+ skipspaces(char *string)
  {
-     switch(opt)
+         const char spaces[] =
      {
-     case XVID_PLG_INFO :
+                         ' ','\t','\0'
-         return 0;
+                 };
+         const char *spacechar = spaces;
+         if (string == NULL) return(NULL);
+         while (*string != '\0') {
+                 /* Test against space chars */
+                 while (*spacechar != '\0') {
+                         if (*string == *spacechar) {
+                                 string++;
+                                 spacechar = spaces;
+                                 break;
+                         }
+                         spacechar++;
+                 }
-     case XVID_PLG_CREATE :
+                 /* No space char */
-         return rc_2pass2_create((xvid_plg_create_t*)param1, param2);
+                 if (*spacechar == '\0') return(string);
+         }
-     case XVID_PLG_DESTROY :
+         return(string);
-         return rc_2pass2_destroy((rc_2pass2_t*)handle, (xvid_plg_destroy_t*)param1);
+ }
-     case XVID_PLG_BEFORE :
+ /* This function returns a boolean that tells if the string is only a
-         return rc_2pass2_before((rc_2pass2_t*)handle, (xvid_plg_data_t*)param1);
+  * comment */
+ static int
+ iscomment(char *string)
+ {
+         const char comments[] =
+                 {
+                         '#',';', '%', '\0'
+                 };
+         const char *cmtchar = comments;
+         int iscomment = 0;
+         if (string == NULL) return(1);
+         string = skipspaces(string);
+         while(*cmtchar != '\0') {
+                 if(*string == *cmtchar) {
+                         iscomment = 1;
+                         break;
+                 }
+                 cmtchar++;
+         }
-     case XVID_PLG_AFTER :
+         return(iscomment);
-         return rc_2pass2_after((rc_2pass2_t*)handle, (xvid_plg_data_t*)param1);
      }
-     return XVID_ERR_FAIL;
+ #if 0
+ static void
+ stats_print(rc_2pass2_t * rc)
+ {
+         int i;
+         const char frame_type[4] = { 'i', 'p', 'b', 's'};
+         for (i=0; i<rc->num_frames; i++) {
+                 twopass_stat_t *s = &rc->stats[i];
+                 DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- frame:%d type:%c quant:%d stats:%d scaled:%d desired:%d actual:%d overflow(%c):%.2f\n",
+                                 i, frame_type[s->type-1], -1, s->length, s->scaled_length,
+                                 s->desired_length, -1, frame_type[s->type-1], -1.0f);
+         }
  }
+ #endif

 Legend:



Removed from v.1.1.2.2
 


changed lines


 
Added in v.1.1.2.37
 Legend:



Removed from v.1.1.2.2
 


changed lines


 
Added in v.1.1.2.37
-Removed from v.1.1.2.2
+Added in v.1.1.2.37

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