--- branches/dev-api-4/xvidcore/vfw/src/codec.c	2003/06/02 11:47:30	1052
+++ branches/dev-api-4/xvidcore/vfw/src/codec.c	2003/12/18 14:51:40	1277
@@ -49,11 +49,13 @@
 
 #include <windows.h>
 #include <vfw.h>
+#include <stdio.h>
 #include "vfwext.h"
 
 #include <xvid.h>
 #include "debug.h"
 #include "codec.h"
+#include "status.h"
 
 
 static const int pmvfast_presets[7] = {
@@ -207,7 +209,7 @@
 
 	if (lpbiOutput == NULL) 
 	{
-		return sizeof(BITMAPV4HEADER);
+		return sizeof(BITMAPINFOHEADER);
 	}
 
 	memcpy(outhdr, inhdr, sizeof(BITMAPINFOHEADER));
@@ -243,7 +245,9 @@
 
 LRESULT compress_frames_info(CODEC * codec, ICCOMPRESSFRAMES * icf)
 {
-    //DPRINTF("%i %i", icf->lStartFrame, icf->lFrameCount);
+#if 0
+    DPRINTF("%i %i", icf->lStartFrame, icf->lFrameCount);
+#endif
 	codec->fincr = icf->dwScale;
 	codec->fbase = icf->dwRate;
 	return ICERR_OK;
@@ -277,11 +281,17 @@
 		{
 			xvid_plg_data_t *data = (xvid_plg_data_t *) param1;
 
-			DPRINTF("[%5i]   type=%c   Q:%2i   length:%6i",
-				   data->frame_num, 
-                   type2char(data->type),
-                   data->quant, 
-                   data->length);
+			/* We don't use DPRINTF here because it's active only for _DEBUG
+			 * builds and that activates lot of other debug printfs. We only
+			 * want these all the time */
+			char buf[1024];
+			sprintf(buf, "[%6i]   type=%c   Q:%2i   length:%6i",
+					data->frame_num, 
+					type2char(data->type),
+					data->quant, 
+					data->length);
+			OutputDebugString(buf);
+
 			return 0;
 		}
 	}
@@ -316,7 +326,7 @@
 	memset(&create, 0, sizeof(create));
 	create.version = XVID_VERSION;
 
-    // zones
+    /* zones */
     create.zones = malloc(sizeof(xvid_enc_zone_t) * codec->config.num_zones);
     create.num_zones = codec->config.num_zones;
     for (i=0; i < create.num_zones; i++) {
@@ -331,7 +341,7 @@
         create.zones[i].base = 100;
     }
 
-    // plugins
+    /* plugins */
 	create.plugins = plugins;
 	switch (codec->config.mode) 
 	{
@@ -360,19 +370,21 @@
 	case RC_MODE_2PASS2 :
     	memset(&pass2, 0, sizeof(pass2));
 	    pass2.version = XVID_VERSION;
-        pass2.bitrate = codec->config.bitrate * CONFIG_KBPS;
+        if (codec->config.use_2pass_bitrate) {
+            pass2.bitrate = codec->config.bitrate * CONFIG_KBPS;
+        }else{
+            pass2.bitrate = -codec->config.desired_size;    /* kilobytes */
+        }
 		pass2.filename = codec->config.stats;
 
         pass2.keyframe_boost = codec->config.keyframe_boost;   /* keyframe boost percentage: [0..100...]; */
-        pass2.payback_method = codec->config.bitrate_payback_method;
-        pass2.bitrate_payback_delay = codec->config.bitrate_payback_delay;
         pass2.curve_compression_high = codec->config.curve_compression_high;
         pass2.curve_compression_low = codec->config.curve_compression_low;
+		pass2.overflow_control_strength = codec->config.overflow_control_strength;
         pass2.max_overflow_improvement = codec->config.twopass_max_overflow_improvement;
         pass2.max_overflow_degradation = codec->config.twopass_max_overflow_degradation;
-        pass2.kftreshold = codec->config.kftreshold;
 	    pass2.kfreduction = codec->config.kfreduction;
-        pass2.min_key_interval = codec->config.min_key_interval;
+        pass2.kfthreshold = codec->config.kfthreshold;
         pass2.container_frame_overhead = 24;    /* AVI */
 
         plugins[create.num_plugins].func = xvid_plugin_2pass2;
@@ -449,18 +461,25 @@
 	codec->framenum = 0;
 	codec->keyspacing = 0;
 
+    if (codec->config.display_status) {
+        status_destroy_always(&codec->status);
+        status_create(&codec->status, codec->fincr, codec->fbase);
+    }
+
 	return ICERR_OK;
 }
 
 
 LRESULT compress_end(CODEC * codec)
 {
-	if (codec->ehandle != NULL)
-	{
+    if (codec->ehandle != NULL) {
 		xvid_encore(codec->ehandle, XVID_ENC_DESTROY, NULL, NULL);
 		codec->ehandle = NULL;
 	}
 
+    if (codec->config.display_status)
+        status_destroy(&codec->status);
+
 	return ICERR_OK;
 }
 
@@ -470,7 +489,11 @@
     int i;
 
     for (i=0; i<config->num_zones && config->zones[i].frame <= framenum; i++) ;
-    i--;
+
+    if (--i < 0) return; /* there are no zones, or we're before the first zone */
+
+    if (framenum == config->zones[i].frame)
+		frame->type = config->zones[i].type;
 
     if (config->zones[i].greyscale) {
         frame->vop_flags |= XVID_VOP_GREYSCALE;
@@ -515,7 +538,7 @@
 		}
 	}
 
-    if ((profiles[codec->config.profile].flags & PROFILE_REDUCED) && 
+    if ((profiles[codec->config.profile].flags & PROFILE_REDUCED) &&
 	    codec->config.reduced_resolution) {
 		frame.vol_flags |= XVID_VOL_REDUCED_ENABLE;
 		frame.vop_flags |= XVID_VOP_REDUCED;	/* XXX: need auto decion mode */
@@ -526,12 +549,29 @@
 		frame.motion |= XVID_ME_QUARTERPELREFINE16 | XVID_ME_QUARTERPELREFINE8;
 	}
 
-	if ((profiles[codec->config.profile].flags & PROFILE_GMC) && codec->config.gmc)
+	if ((profiles[codec->config.profile].flags & PROFILE_GMC) && codec->config.gmc) {
 		frame.vol_flags |= XVID_VOL_GMC;
+		frame.motion |= XVID_ME_GME_REFINE;
+	}
 
 	if ((profiles[codec->config.profile].flags & PROFILE_INTERLACE) && codec->config.interlacing)
 		frame.vol_flags |= XVID_VOL_INTERLACING;
 
+	if (codec->config.ar_mode == 0) { /* PAR */
+		if (codec->config.display_aspect_ratio != 5) {
+			frame.par = codec->config.display_aspect_ratio + 1;
+		} else {
+			frame.par = XVID_PAR_EXT;
+			frame.par_width = codec->config.par_x;
+			frame.par_height= codec->config.par_y;
+		}
+	} else { /* AR */
+		/* custom pixel aspect ratio -> calculated from DAR */
+		frame.par = XVID_PAR_EXT;
+		frame.par_width = (100 * inhdr->biHeight) / codec->config.ar_y;
+		frame.par_height= (100 * inhdr->biWidth) / codec->config.ar_x;;
+	}
+
     /* vop stuff */
 
 	frame.vop_flags |= XVID_VOP_HALFPEL;
@@ -548,39 +588,44 @@
 		frame.vop_flags |= XVID_VOP_INTER4V;
 
 	if (codec->config.chromame)
-		frame.vop_flags |= XVID_ME_CHROMA16 + XVID_ME_CHROMA8;
+		frame.motion |= XVID_ME_CHROMA_PVOP + XVID_ME_CHROMA_BVOP;
+
+	if (codec->config.cartoon_mode) {
+		frame.vop_flags |= XVID_VOP_CARTOON;
+		frame.motion |= XVID_ME_DETECT_STATIC_MOTION;
+	}
 
 	frame.motion |= pmvfast_presets[codec->config.motion_search];
 
 	switch (codec->config.vhq_mode)
 	{
 	case VHQ_MODE_DECISION :
-		frame.vop_flags |= XVID_VOP_MODEDECISION_BITS;
+		frame.vop_flags |= XVID_VOP_MODEDECISION_RD;
 		break;
 
 	case VHQ_LIMITED_SEARCH :
-		frame.vop_flags |= XVID_VOP_MODEDECISION_BITS;
-		frame.motion |= XVID_ME_HALFPELREFINE16_BITS;
-		frame.motion |= XVID_ME_QUARTERPELREFINE16_BITS;
+		frame.vop_flags |= XVID_VOP_MODEDECISION_RD;
+		frame.motion |= XVID_ME_HALFPELREFINE16_RD;
+		frame.motion |= XVID_ME_QUARTERPELREFINE16_RD;
 		break;
 
 	case VHQ_MEDIUM_SEARCH :
-		frame.vop_flags |= XVID_VOP_MODEDECISION_BITS;
-		frame.motion |= XVID_ME_HALFPELREFINE16_BITS;
-		frame.motion |= XVID_ME_HALFPELREFINE8_BITS;
-		frame.motion |= XVID_ME_QUARTERPELREFINE16_BITS;
-		frame.motion |= XVID_ME_QUARTERPELREFINE8_BITS;
-		frame.motion |= XVID_ME_CHECKPREDICTION_BITS;
+		frame.vop_flags |= XVID_VOP_MODEDECISION_RD;
+		frame.motion |= XVID_ME_HALFPELREFINE16_RD;
+		frame.motion |= XVID_ME_HALFPELREFINE8_RD;
+		frame.motion |= XVID_ME_QUARTERPELREFINE16_RD;
+		frame.motion |= XVID_ME_QUARTERPELREFINE8_RD;
+		frame.motion |= XVID_ME_CHECKPREDICTION_RD;
 		break;
 
 	case VHQ_WIDE_SEARCH :
-		frame.vop_flags |= XVID_VOP_MODEDECISION_BITS;
-		frame.motion |= XVID_ME_HALFPELREFINE16_BITS;
-		frame.motion |= XVID_ME_HALFPELREFINE8_BITS;
-		frame.motion |= XVID_ME_QUARTERPELREFINE16_BITS;
-		frame.motion |= XVID_ME_QUARTERPELREFINE8_BITS;
-		frame.motion |= XVID_ME_CHECKPREDICTION_BITS;
-		frame.motion |= XVID_ME_EXTSEARCH_BITS;
+		frame.vop_flags |= XVID_VOP_MODEDECISION_RD;
+		frame.motion |= XVID_ME_HALFPELREFINE16_RD;
+		frame.motion |= XVID_ME_HALFPELREFINE8_RD;
+		frame.motion |= XVID_ME_QUARTERPELREFINE16_RD;
+		frame.motion |= XVID_ME_QUARTERPELREFINE8_RD;
+		frame.motion |= XVID_ME_CHECKPREDICTION_RD;
+		frame.motion |= XVID_ME_EXTSEARCH_RD;
 		break;
 
 	default :
@@ -609,14 +654,7 @@
 
 	// force keyframe spacing in 2-pass 1st pass
 	if (codec->config.motion_search == 0)
-	{
 		frame.type = XVID_TYPE_IVOP;
-	}
-	else if (codec->keyspacing < codec->config.min_key_interval && codec->framenum)
-	{
-		DPRINTF("current frame forced to p-frame");
-		frame.type = XVID_TYPE_PVOP;
-	}
 
     /* frame-based stuff */
     apply_zone_modifiers(&frame, &codec->config, codec->framenum);
@@ -642,6 +680,10 @@
 		return ICERR_UNSUPPORTED;
 	}
 
+    if (codec->config.display_status && stats.type>0) {
+        status_update(&codec->status, stats.type, stats.length, stats.quant);
+    }
+
 	DPRINTF("{type=%i len=%i} length=%i", stats.type, stats.length, length);
 
     if (length == 0)	/* no encoder output */
@@ -725,7 +767,7 @@
 
 	if (get_colorspace(inhdr) != XVID_CSP_NULL) {
 		memcpy(outhdr, inhdr, sizeof(BITMAPINFOHEADER));
-		// XXX: should we set outhdr->biSize ??
+		/* XXX: should we set outhdr->biSize ?? */
 		return ICERR_OK;
 	}
 	/* --- yv12 --- */