--- branches/dev-api-4/xvidcore/vfw/src/codec.c	2003/05/22 22:57:54	1041
+++ branches/dev-api-4/xvidcore/vfw/src/codec.c	2004/01/23 11:17:24	1326
@@ -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] = {
@@ -151,10 +153,10 @@
 
 	default :
 		DPRINTF("unsupported colorspace %c%c%c%c", 
-            hdr->biCompression&0xff,
-            (hdr->biCompression>>8)&0xff,
-            (hdr->biCompression>>16)&0xff,
-            (hdr->biCompression>>24)&0xff);
+			hdr->biCompression&0xff,
+			(hdr->biCompression>>8)&0xff,
+			(hdr->biCompression>>16)&0xff,
+			(hdr->biCompression>>24)&0xff);
 		return XVID_CSP_NULL;
 	}
 }
@@ -170,10 +172,10 @@
 	BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
 	BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;
 
-    /* VFWEXT detection */
-    if (inhdr->biCompression == VFWEXT_FOURCC) {
-        return (ICM_USER+0x0fff);
-    }
+	/* VFWEXT detection */
+	if (inhdr->biCompression == VFWEXT_FOURCC) {
+		return (ICM_USER+0x0fff);
+	}
 
 	if (get_colorspace(inhdr) == XVID_CSP_NULL) 
 	{
@@ -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;
@@ -252,13 +256,13 @@
 
 const char type2char(int type)
 {
-    if (type==XVID_TYPE_IVOP)
-        return 'I';
-    if (type==XVID_TYPE_PVOP)
-        return 'P';
-    if (type==XVID_TYPE_BVOP)
-        return 'B';
-    return 'S';
+	if (type==XVID_TYPE_IVOP)
+		return 'I';
+	if (type==XVID_TYPE_PVOP)
+		return 'P';
+	if (type==XVID_TYPE_BVOP)
+		return 'B';
+	return 'S';
 }
 
 int vfw_debug(void *handle,
@@ -267,8 +271,9 @@
 			 void *param2)
 {
 	switch (opt) {
-	case XVID_PLG_INFO:
 	case XVID_PLG_CREATE:
+		*((void**)param2) = NULL;
+	case XVID_PLG_INFO:
 	case XVID_PLG_DESTROY:
 	case XVID_PLG_BEFORE:
 		return 0;
@@ -277,11 +282,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;
 		}
 	}
@@ -289,84 +300,143 @@
 	return XVID_ERR_FAIL;
 }
 
+#define XVID_DLL_NAME "xvidcore.dll"
+
+static int init_dll()
+{
+	if (m_hdll != NULL) return 0;
+
+	DPRINTF("init_dll");
+	m_hdll = LoadLibrary(XVID_DLL_NAME);
+	if (m_hdll == NULL) {
+		DPRINTF("dll load failed");
+		MessageBox(0, XVID_DLL_NAME " not found","Error", 0);
+		return XVID_ERR_FAIL;
+	}
+
+	xvid_global_func = (int (__cdecl *)(void *, int, void *, void *))GetProcAddress(m_hdll, "xvid_global");
+	if (xvid_global_func == NULL) {
+		MessageBox(0, "xvid_global() not found", "Error", 0);
+		return XVID_ERR_FAIL;
+	}
+
+	xvid_encore_func = (int (__cdecl *)(void *, int, void *, void *))GetProcAddress(m_hdll, "xvid_encore");
+	if (xvid_encore_func == NULL) {
+		MessageBox(0, "xvid_encore() not found", "Error", 0);
+		return XVID_ERR_FAIL;
+	}
+
+	xvid_decore_func = (int (__cdecl *)(void *, int, void *, void *))GetProcAddress(m_hdll, "xvid_decore");
+	if (xvid_decore_func == NULL) {
+		MessageBox(0, "xvid_decore() not found", "Error", 0);
+		return XVID_ERR_FAIL;
+	}
+
+	xvid_plugin_single_func = 
+		(int (__cdecl *)(void *, int, void *, void *))(GetProcAddress(m_hdll, "xvid_plugin_single"));
+	xvid_plugin_2pass1_func = 
+		(int (__cdecl *)(void *, int, void *, void *))(GetProcAddress(m_hdll, "xvid_plugin_2pass1"));
+	xvid_plugin_2pass2_func = 
+		(int (__cdecl *)(void *, int, void *, void *))(GetProcAddress(m_hdll, "xvid_plugin_2pass2"));
+	xvid_plugin_lumimasking_func = 
+		(int (__cdecl *)(void *, int, void *, void *))(GetProcAddress(m_hdll, "xvid_plugin_lumimasking"));
+	xvid_plugin_psnr_func = 
+		(int (__cdecl *)(void *, int, void *, void *))(GetProcAddress(m_hdll, "xvid_plugin_psnr"));
+
+	return 0;
+}
 
 
 LRESULT compress_begin(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiOutput)
 {
 	xvid_gbl_init_t init;
 	xvid_enc_create_t create;
-    xvid_enc_plugin_t plugins[3];
+	xvid_enc_plugin_t plugins[3];
 	xvid_plugin_single_t single;
 	xvid_plugin_2pass1_t pass1;
 	xvid_plugin_2pass2_t pass2;
-    int i;
+	int i;
 
-    /* destroy previously created codec */
+	if (init_dll() != 0) return ICERR_ERROR;
+	/* destroy previously created codec */
 	if(codec->ehandle) {
-		xvid_encore(codec->ehandle, XVID_ENC_DESTROY, NULL, NULL);
+		xvid_encore_func(codec->ehandle, XVID_ENC_DESTROY, NULL, NULL);
 		codec->ehandle = NULL;
 	}
 
-    memset(&init, 0, sizeof(init));
+	memset(&init, 0, sizeof(init));
 	init.version = XVID_VERSION;
 	init.cpu_flags = codec->config.cpu;
-    init.debug = codec->config.debug;
-	xvid_global(0, XVID_GBL_INIT, &init, NULL);
+	init.debug = codec->config.debug;
+	xvid_global_func(0, XVID_GBL_INIT, &init, NULL);
 
 	memset(&create, 0, sizeof(create));
 	create.version = XVID_VERSION;
 
-    // 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++) {
-        create.zones[i].frame = codec->config.zones[i].frame;
-        if (codec->config.zones[i].mode == RC_ZONE_QUANT) {
-            create.zones[i].mode = XVID_ZONE_QUANT;
-            create.zones[i].increment = codec->config.zones[i].quant;
-        }else{
-            create.zones[i].mode = XVID_ZONE_WEIGHT;
-            create.zones[i].increment = codec->config.zones[i].weight;
-        }
-        create.zones[i].base = 100;
-    }
+	/* 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++) {
+		create.zones[i].frame = codec->config.zones[i].frame;
+		if (codec->config.zones[i].mode == RC_ZONE_QUANT) {
+			create.zones[i].mode = XVID_ZONE_QUANT;
+			create.zones[i].increment = codec->config.zones[i].quant;
+		}else{
+			create.zones[i].mode = XVID_ZONE_WEIGHT;
+			create.zones[i].increment = codec->config.zones[i].weight;
+		}
+		create.zones[i].base = 100;
+	}
 
-    // plugins
+	/* plugins */
 	create.plugins = plugins;
 	switch (codec->config.mode) 
 	{
 	case RC_MODE_1PASS :
-    	memset(&single, 0, sizeof(single));
-	    single.version = XVID_VERSION;
-        single.bitrate = codec->config.bitrate * CONFIG_KBPS;
-        single.reaction_delay_factor = codec->config.rc_reaction_delay_factor;
+		memset(&single, 0, sizeof(single));
+		single.version = XVID_VERSION;
+		single.bitrate = codec->config.bitrate * CONFIG_KBPS;
+		single.reaction_delay_factor = codec->config.rc_reaction_delay_factor;
 		single.averaging_period = codec->config.rc_averaging_period;
 		single.buffer = codec->config.rc_buffer;
-        plugins[create.num_plugins].func = xvid_plugin_single;
-        plugins[create.num_plugins].param = &single;
-        create.num_plugins++;
-        break;
+		plugins[create.num_plugins].func = xvid_plugin_single_func;
+		plugins[create.num_plugins].param = &single;
+		create.num_plugins++;
+		break;
 
 	case RC_MODE_2PASS1 :
-    	memset(&pass1, 0, sizeof(pass1));
-	    pass1.version = XVID_VERSION;
-        pass1.filename = codec->config.stats;
-
-        plugins[create.num_plugins].func = xvid_plugin_2pass1;
-        plugins[create.num_plugins].param = &pass1;
-        create.num_plugins++;
+		memset(&pass1, 0, sizeof(pass1));
+		pass1.version = XVID_VERSION;
+		pass1.filename = codec->config.stats;
+
+		plugins[create.num_plugins].func = xvid_plugin_2pass1_func;
+		plugins[create.num_plugins].param = &pass1;
+		create.num_plugins++;
 		break;
 
 	case RC_MODE_2PASS2 :
-    	memset(&pass2, 0, sizeof(pass2));
-	    pass2.version = XVID_VERSION;
-        pass2.bitrate = codec->config.bitrate * CONFIG_KBPS;
+		memset(&pass2, 0, sizeof(pass2));
+		pass2.version = XVID_VERSION;
+		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.container_frame_overhead = 24;
 
-        plugins[create.num_plugins].func = xvid_plugin_2pass2;
-        plugins[create.num_plugins].param = &pass2;
-        create.num_plugins++;
+		pass2.keyframe_boost = codec->config.keyframe_boost;   /* keyframe boost percentage: [0..100...]; */
+		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.kfreduction = codec->config.kfreduction;
+		pass2.kfthreshold = codec->config.kfthreshold;
+		pass2.container_frame_overhead = 24;	/* AVI */
+
+		plugins[create.num_plugins].func = xvid_plugin_2pass2_func;
+		plugins[create.num_plugins].param = &pass2;
+		create.num_plugins++;
 		break;
 
 	case RC_MODE_NULL :
@@ -377,49 +447,49 @@
 	}
 
   	if ((profiles[codec->config.profile].flags & PROFILE_ADAPTQUANT) && codec->config.lum_masking) {
-        plugins[create.num_plugins].func = xvid_plugin_lumimasking;
-        plugins[create.num_plugins].param = NULL;
-        create.num_plugins++; 
+		plugins[create.num_plugins].func = xvid_plugin_lumimasking_func;
+		plugins[create.num_plugins].param = NULL;
+		create.num_plugins++; 
 	}
 
-    plugins[create.num_plugins].func = vfw_debug;
-    plugins[create.num_plugins].param = NULL;
-    create.num_plugins++; 
+	plugins[create.num_plugins].func = vfw_debug;
+	plugins[create.num_plugins].param = NULL;
+	create.num_plugins++; 
 
-    create.profile = profiles[codec->config.profile].id;
+	create.profile = profiles[codec->config.profile].id;
 
 	create.width = lpbiInput->bmiHeader.biWidth;
 	create.height = lpbiInput->bmiHeader.biHeight;
 	create.fincr = codec->fincr;
 	create.fbase = codec->fbase;
 
-    create.max_key_interval = codec->config.max_key_interval;
+	create.max_key_interval = codec->config.max_key_interval;
 
-    create.min_quant[0] = codec->config.min_iquant;
-    create.max_quant[0] = codec->config.max_iquant;
-    create.min_quant[1] = codec->config.min_pquant;
-    create.max_quant[1] = codec->config.max_pquant;
-    create.min_quant[2] = codec->config.min_bquant;
-    create.max_quant[2] = codec->config.max_bquant;
-
-    if ((profiles[codec->config.profile].flags & PROFILE_BVOP) && codec->config.use_bvop) {
-        create.max_bframes = codec->config.max_bframes;
-	    create.bquant_ratio = codec->config.bquant_ratio;
-	    create.bquant_offset = codec->config.bquant_offset;
+	create.min_quant[0] = codec->config.min_iquant;
+	create.max_quant[0] = codec->config.max_iquant;
+	create.min_quant[1] = codec->config.min_pquant;
+	create.max_quant[1] = codec->config.max_pquant;
+	create.min_quant[2] = codec->config.min_bquant;
+	create.max_quant[2] = codec->config.max_bquant;
+
+	if ((profiles[codec->config.profile].flags & PROFILE_BVOP) && codec->config.use_bvop) {
+		create.max_bframes = codec->config.max_bframes;
+		create.bquant_ratio = codec->config.bquant_ratio;
+		create.bquant_offset = codec->config.bquant_offset;
 
-        if (codec->config.packed) 
-            create.global |= XVID_GLOBAL_PACKED;
+		if (codec->config.packed) 
+			create.global |= XVID_GLOBAL_PACKED;
 
-	    if (codec->config.closed_gov) 
-		    create.global |= XVID_GLOBAL_CLOSED_GOP;
+		if (codec->config.closed_gov) 
+			create.global |= XVID_GLOBAL_CLOSED_GOP;
 
-    }
+	}
 
 	create.frame_drop_ratio = codec->config.frame_drop_ratio;
 
-    create.num_threads = codec->config.num_threads;
+	create.num_threads = codec->config.num_threads;
 
-	switch(xvid_encore(0, XVID_ENC_CREATE, &create, NULL))
+	switch(xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))
 	{
 	case XVID_ERR_FAIL :	
 		return ICERR_ERROR;
@@ -438,40 +508,55 @@
 	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)
-	{
-		xvid_encore(codec->ehandle, XVID_ENC_DESTROY, NULL, NULL);
-		codec->ehandle = NULL;
+	if (m_hdll != NULL) {
+		if (codec->ehandle != NULL) {
+			xvid_encore_func(codec->ehandle, XVID_ENC_DESTROY, NULL, NULL);
+			codec->ehandle = NULL;
+		}
+		FreeLibrary(m_hdll);
+		m_hdll = NULL;
 	}
 
+	if (codec->config.display_status)
+		status_destroy(&codec->status);
+
 	return ICERR_OK;
 }
 
 
 static void apply_zone_modifiers(xvid_enc_frame_t * frame, CONFIG * config, int framenum)
 {
-    int i;
+	int i;
+
+	for (i=0; i<config->num_zones && config->zones[i].frame <= framenum; 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 (config->zones[i].greyscale) {
-        frame->vop_flags |= XVID_VOP_GREYSCALE;
-    }
-
-    if (config->zones[i].chroma_opt) {
-        frame->vop_flags |= XVID_VOP_CHROMAOPT;
-    }
-
-    if ((profiles[config->profile].flags & PROFILE_BVOP) && config->use_bvop) {
-        frame->bframe_threshold = config->zones[i].bvop_threshold;
-    }
+	if (framenum == config->zones[i].frame)
+		frame->type = config->zones[i].type;
+
+	if (config->zones[i].greyscale) {
+		frame->vop_flags |= XVID_VOP_GREYSCALE;
+	}
+
+	if (config->zones[i].chroma_opt) {
+		frame->vop_flags |= XVID_VOP_CHROMAOPT;
+	}
+
+	if ((profiles[config->profile].flags & PROFILE_BVOP) && config->use_bvop) {
+		frame->bframe_threshold = config->zones[i].bvop_threshold;
+	}
 }
 
 
@@ -486,12 +571,12 @@
 	memset(&frame, 0, sizeof(frame));
 	frame.version = XVID_VERSION;
 
-    frame.type = XVID_TYPE_AUTO;
+	frame.type = XVID_TYPE_AUTO;
 
 	/* vol stuff */
 
-    if ((profiles[codec->config.profile].flags & PROFILE_MPEGQUANT) && 
-        codec->config.quant_type != QUANT_MODE_H263)
+	if ((profiles[codec->config.profile].flags & PROFILE_MPEGQUANT) && 
+		codec->config.quant_type != QUANT_MODE_H263)
 	{
 		frame.vol_flags |= XVID_VOL_MPEGQUANT;
 
@@ -504,8 +589,8 @@
 		}
 	}
 
-    if ((profiles[codec->config.profile].flags & PROFILE_REDUCED) && 
-	    codec->config.reduced_resolution) {
+	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 */
 	}
@@ -515,13 +600,30 @@
 		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;
 
-    /* vop stuff */
+	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;
 	frame.vop_flags |= XVID_VOP_HQACPRED;
@@ -529,47 +631,57 @@
 	if (codec->config.vop_debug) 
 		frame.vop_flags |= XVID_VOP_DEBUG;
 
-    if (codec->config.trellis_quant) {
-        frame.vop_flags |= XVID_VOP_TRELLISQUANT;
-    }
+	if (codec->config.trellis_quant) {
+		frame.vop_flags |= XVID_VOP_TRELLISQUANT;
+	}
 
-    if (codec->config.motion_search > 4)
+	if (codec->config.motion_search > 4)
 		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;
+	}
+
+	if (codec->config.turbo)
+ 		frame.motion |= XVID_ME_FASTREFINE16 | XVID_ME_FASTREFINE8 | 
+						XVID_ME_SKIP_DELTASEARCH | XVID_ME_FAST_MODEINTERPOLATE | 
+						XVID_ME_BFRAME_EARLYSTOP;
 
 	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 :
@@ -588,34 +700,27 @@
 	frame.bitstream = icc->lpOutput;
 	frame.length = icc->lpbiOutput->biSizeImage;
 
-    frame.quant = 0;
+	frame.quant = 0;
 
-    if (codec->config.mode == RC_MODE_NULL) {
+	if (codec->config.mode == RC_MODE_NULL) {
 		outhdr->biSizeImage = 0;
 		*icc->lpdwFlags = AVIIF_KEYFRAME;
 		return ICERR_OK;
-    }
+	}
 
 	// 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);
+	/* frame-based stuff */
+	apply_zone_modifiers(&frame, &codec->config, codec->framenum);
 
-    /* call encore */
+	/* call encore */
 
 	memset(&stats, 0, sizeof(stats));
 	stats.version = XVID_VERSION;
 
-    length = xvid_encore(codec->ehandle, XVID_ENC_ENCODE, &frame, &stats);
+	length = xvid_encore_func(codec->ehandle, XVID_ENC_ENCODE, &frame, &stats);
 	switch (length) 
 	{
 	case XVID_ERR_FAIL :	
@@ -631,9 +736,13 @@
 		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 */
+	if (length == 0)	/* no encoder output */
 	{
 		*icc->lpdwFlags = 0;
 		((char*)icc->lpOutput)[0] = 0x7f;	/* virtual dub skip frame */
@@ -641,22 +750,22 @@
 		
 	}else{
 		if (frame.out_flags & XVID_KEYFRAME)
-	    {
-		    codec->keyspacing = 0;
-		    *icc->lpdwFlags = AVIIF_KEYFRAME;
-	    }
-	    else
-	    {
-		     *icc->lpdwFlags = 0;
-	    }
-
-    	outhdr->biSizeImage = length;
-
-    	if (codec->config.mode == RC_MODE_2PASS1 && codec->config.discard1pass)
-	    {
-		    outhdr->biSizeImage = 0;
-	    }
-    }
+		{
+			codec->keyspacing = 0;
+			*icc->lpdwFlags = AVIIF_KEYFRAME;
+		}
+		else
+		{
+			 *icc->lpdwFlags = 0;
+		}
+
+		outhdr->biSizeImage = length;
+
+		if (codec->config.mode == RC_MODE_2PASS1 && codec->config.discard1pass)
+		{
+			outhdr->biSizeImage = 0;
+		}
+	}
 
 	codec->framenum++;
 	codec->keyspacing++;
@@ -714,7 +823,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 --- */
@@ -740,23 +849,33 @@
 	return ICERR_OK;
 }
 
+#define REG_GET_N(X, Y, Z) \
+{ \
+	DWORD size = sizeof(int); \
+	if (RegQueryValueEx(hKey, X, 0, 0, (LPBYTE)&Y, &size) != ERROR_SUCCESS) { \
+		Y=Z; \
+	} \
+}while(0)
 
 LRESULT decompress_begin(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiOutput)
 {
 	xvid_gbl_init_t init;
 	xvid_dec_create_t create;
+	HKEY hKey;
+
+	if (init_dll() != 0) return ICERR_ERROR;
 
 	memset(&init, 0, sizeof(init));
 	init.version = XVID_VERSION;
 	init.cpu_flags = codec->config.cpu;
-	xvid_global(0, XVID_GBL_INIT, &init, NULL);
+	xvid_global_func(0, XVID_GBL_INIT, &init, NULL);
 
 	memset(&create, 0, sizeof(create));
 	create.version = XVID_VERSION;
 	create.width = lpbiInput->bmiHeader.biWidth;
 	create.height = lpbiInput->bmiHeader.biHeight;
 
-	switch(xvid_decore(0, XVID_DEC_CREATE, &create, NULL)) 
+	switch(xvid_decore_func(0, XVID_DEC_CREATE, &create, NULL)) 
 	{
 	case XVID_ERR_FAIL :	
 		return ICERR_ERROR;
@@ -773,17 +892,30 @@
 
 	codec->dhandle = create.handle;
 
+	RegOpenKeyEx(XVID_REG_KEY, XVID_REG_PARENT "\\" XVID_REG_CHILD, 0, KEY_READ, &hKey);
+
+	REG_GET_N("Deblock_Y",  pp_dy, 0)
+	REG_GET_N("Deblock_UV", pp_duv, 0)
+	REG_GET_N("Dering",  pp_dr, 0)
+	REG_GET_N("FilmEffect", pp_fe, 0)
+
+	RegCloseKey(hKey);
+
 	return ICERR_OK;
 }
 
 
 LRESULT decompress_end(CODEC * codec)
 {
-	if (codec->dhandle != NULL)
-	{
-		xvid_decore(codec->dhandle, XVID_DEC_DESTROY, NULL, NULL);
-		codec->dhandle = NULL;
+	if (m_hdll != NULL) {
+		if (codec->dhandle != NULL) {
+			xvid_decore_func(codec->dhandle, XVID_DEC_DESTROY, NULL, NULL);
+			codec->dhandle = NULL;
+		}
+		FreeLibrary(m_hdll);
+		m_hdll = NULL;
 	}
+
 	return ICERR_OK;
 }
 
@@ -800,14 +932,14 @@
 		xvid_gbl_convert_t convert;
 
 		DPRINTF("input=%c%c%c%c output=%c%c%c%c", 
-            icd->lpbiInput->biCompression&0xff,
-            (icd->lpbiInput->biCompression>>8)&0xff,
-            (icd->lpbiInput->biCompression>>16)&0xff,
-            (icd->lpbiInput->biCompression>>24)&0xff,
-            icd->lpbiOutput->biCompression&0xff,
-            (icd->lpbiOutput->biCompression>>8)&0xff,
-            (icd->lpbiOutput->biCompression>>16)&0xff,
-            (icd->lpbiOutput->biCompression>>24)&0xff);
+			icd->lpbiInput->biCompression&0xff,
+			(icd->lpbiInput->biCompression>>8)&0xff,
+			(icd->lpbiInput->biCompression>>16)&0xff,
+			(icd->lpbiInput->biCompression>>24)&0xff,
+			icd->lpbiOutput->biCompression&0xff,
+			(icd->lpbiOutput->biCompression>>8)&0xff,
+			(icd->lpbiOutput->biCompression>>16)&0xff,
+			(icd->lpbiOutput->biCompression>>24)&0xff);
 
 		memset(&convert, 0, sizeof(convert));
 		convert.version = XVID_VERSION;
@@ -829,7 +961,7 @@
 		convert.interlacing = 0;
 		if (convert.input.csp == XVID_CSP_NULL ||
 			convert.output.csp == XVID_CSP_NULL ||
-			xvid_global(0, XVID_GBL_CONVERT, &convert, NULL) < 0)
+			xvid_global_func(0, XVID_GBL_CONVERT, &convert, NULL) < 0)
 		{
 			 return ICERR_BADFORMAT;
 		}
@@ -837,9 +969,9 @@
 	}
 	/* --- yv12 --- */
 	
-    memset(&frame, 0, sizeof(frame));
-    frame.version = XVID_VERSION;
-    frame.general = XVID_LOWDELAY;	/* force low_delay_default mode */
+	memset(&frame, 0, sizeof(frame));
+	frame.version = XVID_VERSION;
+	frame.general = XVID_LOWDELAY;	/* force low_delay_default mode */
 	frame.bitstream = icd->lpInput;
 	frame.length = icd->lpbiInput->biSizeImage;
 	
@@ -859,7 +991,12 @@
 		frame.output.csp = XVID_CSP_NULL;
 	}
 
-	switch (xvid_decore(codec->dhandle, XVID_DEC_DECODE, &frame, NULL)) 
+	if (pp_dy)frame.general |= XVID_DEBLOCKY;
+	if (pp_duv) frame.general |= XVID_DEBLOCKUV;
+/*	if (pp_dr) frame.general |= XVID_DERING; */
+	if (pp_fe) frame.general |= XVID_FILMEFFECT;
+
+	switch (xvid_decore_func(codec->dhandle, XVID_DEC_DECODE, &frame, NULL)) 
 	{
 	case XVID_ERR_FAIL :	
 		return ICERR_ERROR;