--- plugin_2pass1.c 2003/11/19 15:42:38 1.1.2.9 +++ plugin_2pass1.c 2003/12/18 17:43:32 1.1.2.11 @@ -22,7 +22,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: plugin_2pass1.c,v 1.1.2.9 2003/11/19 15:42:38 syskin Exp $ + * $Id: plugin_2pass1.c,v 1.1.2.11 2003/12/18 17:43:32 edgomez Exp $ * *****************************************************************************/ @@ -89,26 +89,26 @@ static int rc_2pass1_before(rc_2pass1_t * rc, xvid_plg_data_t * data) { - if (data->quant <= 0) { - if (data->zone && data->zone->mode == XVID_ZONE_QUANT) { - rc->fq_error += (double)data->zone->increment / (double)data->zone->base; - data->quant = (int)rc->fq_error; - rc->fq_error -= data->quant; - - }else { - data->quant = 2; - } - } - return 0; + if (data->quant <= 0) { + if (data->zone && data->zone->mode == XVID_ZONE_QUANT) { + rc->fq_error += (double)data->zone->increment / (double)data->zone->base; + data->quant = (int)rc->fq_error; + rc->fq_error -= data->quant; + } else { + data->quant = 2; + } + } + return(0); } static int rc_2pass1_after(rc_2pass1_t * rc, xvid_plg_data_t * data) { char type; + xvid_enc_stats_t *stats = &data->stats; /* Frame type in ascii I/P/B */ - switch(data->type) { + switch(stats->type) { case XVID_TYPE_IVOP: type = 'i'; break; @@ -127,13 +127,14 @@ /* write the resulting statistics */ - fprintf(rc->stat_file, "%c %d %d %d %d %d\n", - type, - data->quant, - data->kblks, - data->mblks, - data->ublks, - data->length); + fprintf(rc->stat_file, "%c %d %d %d %d %d %d\n", + type, + stats->quant, + stats->kblks, + stats->mblks, + stats->ublks, + stats->length, + stats->hlength); return(0); }