--- branches/dev-api-4/xvidcore/src/plugins/plugin_2pass1.c	2003/12/18 17:43:32	1278
+++ branches/dev-api-4/xvidcore/src/plugins/plugin_2pass1.c	2003/12/20 15:38:13	1287
@@ -22,16 +22,21 @@
  *  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.11 2003-12-18 17:43:32 edgomez Exp $
+ * $Id: plugin_2pass1.c,v 1.1.2.13 2003-12-20 15:38:13 syskin Exp $
  *
  *****************************************************************************/
 
 #include <stdio.h>
+#include <errno.h> /* errno var (or function with recent libc) */
+#include <string.h> /* strerror() */
 
 #include "../xvid.h"
 #include "../image/image.h"
 
 
+#define FAST1PASS
+
+
 /* context struct */
 typedef struct
 {
@@ -63,6 +68,33 @@
 	if((rc->stat_file = fopen(param->filename, "w+b")) == NULL)
 		return(XVID_ERR_FAIL);
 
+	/* I swear xvidcore isn't buggy, but when using mencoder+xvid4 i observe
+	 * this weird bug.
+	 *
+	 * Symptoms: The stats file grows until it's fclosed, but at this moment
+	 *           a large part of the file is filled by 0x00 bytes w/o any
+	 *           reasonable cause. The stats file is then completly unusable
+	 *
+	 * So far, i think i found "the why":
+	 *  - take a MPEG stream containing 2 sequences (concatenate 2 MPEG files
+	 *    together)
+	 *  - Encode this MPEG file
+	 *
+	 * It should trigger the bug
+	 *
+	 * I think this is caused by some kind of race condition on mencoder module
+	 * start/stop.
+	 *  - mencoder encodes the first sequence
+	 *    + xvid4 module opens xvid-twopass.stats and writes stats in it.
+	 *  - mencoder detects the second sequence and initialize a second
+	 *    module and stops the old encoder
+	 *    + new xvid4 module opens a new xvid-twopass.stats, old xvid4
+	 *      module closes it
+	 *
+	 * This is IT, got a racing condition.
+	 * Unbuffered IO, may help ... */
+	setbuf(rc->stat_file, NULL);
+
 	/*
 	 * The File Header
 	 */
@@ -81,8 +113,13 @@
 
 static int rc_2pass1_destroy(rc_2pass1_t * rc, xvid_plg_destroy_t * destroy)
 {
-	fclose(rc->stat_file);
-	free(rc);
+	if (rc->stat_file) {
+		if (fclose(rc->stat_file) == EOF) {
+			DPRINTF(XVID_DEBUG_RC, "Error closing stats file (%s)", strerror(errno));
+		}
+	}
+	rc->stat_file = NULL; /* Just a paranoid reset */
+	free(rc); /* as the container structure is freed anyway */
 	return(0);
 }
 
@@ -96,6 +133,20 @@
 			rc->fq_error -= data->quant;
 		} else {
 			data->quant = 2;
+
+#ifdef FAST1PASS
+
+			data->motion_flags &= ~(XVID_ME_CHROMA_PVOP + XVID_ME_CHROMA_BVOP + XVID_ME_USESQUARES16
+									+ XVID_ME_ADVANCEDDIAMOND16 + XVID_ME_EXTSEARCH16);
+			
+			data->motion_flags |= XVID_ME_FAST_MODEINTERPOLATE + XVID_ME_SKIP_DELTASEARCH
+									+ XVID_ME_FASTREFINE16 + XVID_ME_BFRAME_EARLYSTOP;
+
+			data->vop_flags &= ~(XVID_VOP_MODEDECISION_RD + XVID_VOP_FAST_MODEDECISION_RD
+								+ XVID_VOP_TRELLISQUANT + XVID_VOP_INTER4V + XVID_VOP_HQACPRED);
+
+			data->vol_flags &= ~XVID_VOL_GMC;
+#endif
 		}
 	}
 	 return(0);