--- plugin_2pass1.c 2003/05/17 13:36:38 1.1.2.4 +++ plugin_2pass1.c 2003/11/09 20:49:21 1.1.2.8 @@ -1,28 +1,28 @@ /****************************************************************************** * - * XviD Bit Rate Controller Library - * - VBR 2 pass bitrate controler implementation - + * XviD Bit Rate Controller Library + * - VBR 2 pass bitrate controler implementation - * - * Copyright (C) 2002 Edouard Gomez + * Copyright (C) 2002-2003 Edouard Gomez * - * The curve treatment algorithm is the one implemented by Foxer and - * Dirk Knop for the XviD vfw dynamic library. + * The curve treatment algorithm is the one implemented by Foxer and + * Dirk Knop for the XviD vfw dynamic library. * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * 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.4 2003/05/17 13:36:38 suxen_drol Exp $ + * $Id: plugin_2pass1.c,v 1.1.2.8 2003/11/09 20:49:21 edgomez Exp $ * *****************************************************************************/ @@ -48,28 +48,30 @@ rc_2pass1_t * rc; /* check filename */ - if (param->filename == NULL || param->filename[0] == '\0') + if ((param->filename == NULL) || + (param->filename != NULL && param->filename[0] == '\0')) return XVID_ERR_FAIL; /* allocate context struct */ if((rc = malloc(sizeof(rc_2pass1_t))) == NULL) return(XVID_ERR_MEMORY); - /* Initialize safe defaults for 2pass 1 */ + /* Initialize safe defaults for 2pass 1 */ rc->stat_file = NULL; /* Open the 1st pass file */ - if((rc->stat_file = fopen(param->filename, "w+")) == NULL) + if((rc->stat_file = fopen(param->filename, "w+b")) == NULL) return(XVID_ERR_FAIL); /* * The File Header */ - /* fprintf(rc->stat_file, "# XviD 2pass stat file\n"); - fprintf(rc->stat_file, "version %i.%i.%i\n",XVID_MAJOR(XVID_VERSION), XVID_MINOR(XVID_VERSION), XVID_PATCH(XVID_VERSION)); - fprintf(rc->stat_file, "start\n"); - fprintf(rc->stat_file, "type quantizer length kblocks mblocks ublocks\n"); */ - + fprintf(rc->stat_file, "# XviD 2pass stat file (core version %d.%d.%d)\n", + XVID_VERSION_MAJOR(XVID_VERSION), + XVID_VERSION_MINOR(XVID_VERSION), + XVID_VERSION_PATCH(XVID_VERSION)); + fprintf(rc->stat_file, "# Please do not modify this file\n\n"); + rc->fq_error = 0; *handle = rc; @@ -80,7 +82,6 @@ static int rc_2pass1_destroy(rc_2pass1_t * rc, xvid_plg_destroy_t * destroy) { fclose(rc->stat_file); - free(rc); return(0); } @@ -93,7 +94,7 @@ 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; }