--- branches/dev-api-4/xvidcore/src/plugins/plugin_2pass1.c	2003/04/08 14:01:35	977
+++ branches/dev-api-4/xvidcore/src/plugins/plugin_2pass1.c	2003/12/17 15:16:16	1267
@@ -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 <ed.gomez@wanadoo.fr>
+ *  Copyright (C) 2002-2003 Edouard Gomez <ed.gomez@free.fr>
  *
- * The curve treatment algorithm is the one implemented by Foxer <email?> and
- * Dirk Knop <dknop@gwdg.de> for the XviD vfw dynamic library.
+ *  The curve treatment algorithm is the one implemented by Foxer <email?> and
+ *  Dirk Knop <dknop@gwdg.de> 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.2 2003-04-08 14:01:09 suxen_drol Exp $
+ * $Id: plugin_2pass1.c,v 1.1.2.10 2003-12-17 15:16:16 edgomez Exp $
  *
  *****************************************************************************/
 
@@ -36,6 +36,8 @@
 typedef struct
 {
 	FILE * stat_file;
+
+    double fq_error;
 } rc_2pass1_t;
 
 
@@ -46,27 +48,31 @@
 	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;
 	return(0);
@@ -75,9 +81,7 @@
 
 static int rc_2pass1_destroy(rc_2pass1_t * rc, xvid_plg_destroy_t * destroy)
 {
-    //fprintf(rc->stat_file, "stop\n");
 	fclose(rc->stat_file);
-
 	free(rc);
 	return(0);
 }
@@ -85,9 +89,16 @@
 
 static int rc_2pass1_before(rc_2pass1_t * rc, xvid_plg_data_t * data)
 {
-    data->quant = 2;
-    data->type = XVID_TYPE_AUTO;
-    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);
 }
 
 
@@ -133,6 +144,7 @@
     switch(opt)
     {
     case XVID_PLG_INFO :
+	case XVID_PLG_FRAME :
         return 0;
 
     case XVID_PLG_CREATE :