--- branches/dev-api-4/xvidcore/src/plugins/plugin_single.c	2003/05/17 13:37:49	1032
+++ branches/dev-api-4/xvidcore/src/plugins/plugin_single.c	2003/11/28 14:20:13	1225
@@ -1,26 +1,26 @@
 /*****************************************************************************
  *
- * XviD Standard Plugins
- * - single-pass bitrate controller implementation -
+ *  XviD Standard Plugins
+ *  - single-pass bitrate controller implementation -
  *
  *  Copyright(C) 2002      Benjamin Lambert <foxer@hotmail.com>
  *               2002-2003 Edouard Gomez <ed.gomez@free.fr>
  *
- * 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_single.c,v 1.1.2.2 2003-05-17 13:36:38 suxen_drol Exp $
+ * $Id: plugin_single.c,v 1.1.2.7 2003-11-28 14:20:13 syskin Exp $
  *
  ****************************************************************************/
 
@@ -30,7 +30,7 @@
 #include "../xvid.h"
 #include "../image/image.h"
 
-#define DEFAULT_INITIAL_QUANTIZER 5
+#define DEFAULT_INITIAL_QUANTIZER 8
 
 #define DEFAULT_BITRATE 900000	/* 900kbps */
 #define DEFAULT_DELAY_FACTOR 16
@@ -173,14 +173,18 @@
 	double base_quality;
 	double target_quality;
 
-
 	/* Update internal values */
 	rc->time += (double) data->fincr / data->fbase;
 	rc->total_size += data->length;
 
+	if(data->type == XVID_TYPE_BVOP)
+		return (0);
+
+	rc->rtn_quant = data->quant;
+
 	/* Compute the deviation from expected total size */
-	deviation = (int64_t)
-		((double) rc->total_size - (double) rc->bytes_per_sec * rc->time);
+	deviation = 
+		rc->total_size - rc->bytes_per_sec * rc->time;
 
 
 	if (data->quant >= 2) {
@@ -241,11 +245,13 @@
 	else if (rtn_quant < data->quant - 1)
 		rtn_quant = data->quant - 1;
 
-    /* limit to min/max range */
-	if (rtn_quant > data->max_quant[data->type-1])
-		rtn_quant = data->max_quant[data->type-1];
-	else if (rtn_quant < data->min_quant[data->type-1])
-		rtn_quant = data->min_quant[data->type-1];
+    /* limit to min/max range 
+	   we don't know frame type of the next frame, so we just use 
+	   P-VOP's range... */
+	if (rtn_quant > data->max_quant[XVID_TYPE_PVOP-1])
+		rtn_quant = data->max_quant[XVID_TYPE_PVOP-1];
+	else if (rtn_quant < data->min_quant[XVID_TYPE_PVOP-1])
+		rtn_quant = data->min_quant[XVID_TYPE_PVOP-1];
 
 	rc->rtn_quant = rtn_quant;
 
@@ -262,6 +268,7 @@
 {
 	switch (opt) {
 	case XVID_PLG_INFO:
+	case XVID_PLG_FRAME :
 		return 0;
 
 	case XVID_PLG_CREATE: