--- trunk/xvidcore/vfw/src/codec.c	2004/03/22 22:36:25	1382
+++ trunk/xvidcore/vfw/src/codec.c	2004/07/15 11:53:46	1495
@@ -57,17 +57,6 @@
 #include "codec.h"
 #include "status.h"
 
-HINSTANCE m_hdll;
-int (*xvid_global_func)(void *handle, int opt, void *param1, void *param2);
-int (*xvid_encore_func)(void *handle, int opt, void *param1, void *param2);
-int (*xvid_decore_func)(void *handle, int opt, void *param1, void *param2);
-
-xvid_plugin_func *xvid_plugin_single_func, 
-				*xvid_plugin_2pass1_func,
-				*xvid_plugin_2pass2_func,
-				*xvid_plugin_lumimasking_func,
-				*xvid_plugin_psnr_func;
-
 
 
 static const int pmvfast_presets[7] = {
@@ -314,46 +303,47 @@
 
 #define XVID_DLL_NAME "xvidcore.dll"
 
-static int init_dll()
+static int init_dll(CODEC* codec)
 {
-	if (m_hdll != NULL) return 0;
+	if (codec->m_hdll != NULL)
+		return 0;
 
 	DPRINTF("init_dll");
-	m_hdll = LoadLibrary(XVID_DLL_NAME);
-	if (m_hdll == NULL) {
+	codec->m_hdll = LoadLibrary(XVID_DLL_NAME);
+	if (codec->m_hdll == NULL) {
 		DPRINTF("dll load failed");
 		MessageBox(0, XVID_DLL_NAME " not found!","Error!", MB_ICONEXCLAMATION|MB_OK);
 		return XVID_ERR_FAIL;
 	}
 
-	xvid_global_func = (int (__cdecl *)(void *, int, void *, void *))GetProcAddress(m_hdll, "xvid_global");
-	if (xvid_global_func == NULL) {
+	codec->xvid_global_func = (int (__cdecl *)(void *, int, void *, void *))GetProcAddress(codec->m_hdll, "xvid_global");
+	if (codec->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) {
+	codec->xvid_encore_func = (int (__cdecl *)(void *, int, void *, void *))GetProcAddress(codec->m_hdll, "xvid_encore");
+	if (codec->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) {
+	codec->xvid_decore_func = (int (__cdecl *)(void *, int, void *, void *))GetProcAddress(codec->m_hdll, "xvid_decore");
+	if (codec->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"));
+	codec->xvid_plugin_single_func = 
+		(int (__cdecl *)(void *, int, void *, void *))(GetProcAddress(codec->m_hdll, "xvid_plugin_single"));
+	codec->xvid_plugin_2pass1_func = 
+		(int (__cdecl *)(void *, int, void *, void *))(GetProcAddress(codec->m_hdll, "xvid_plugin_2pass1"));
+	codec->xvid_plugin_2pass2_func = 
+		(int (__cdecl *)(void *, int, void *, void *))(GetProcAddress(codec->m_hdll, "xvid_plugin_2pass2"));
+	codec->xvid_plugin_lumimasking_func = 
+		(int (__cdecl *)(void *, int, void *, void *))(GetProcAddress(codec->m_hdll, "xvid_plugin_lumimasking"));
+	codec->xvid_plugin_psnr_func = 
+		(int (__cdecl *)(void *, int, void *, void *))(GetProcAddress(codec->m_hdll, "xvid_plugin_psnr"));
 
 	return 0;
 }
@@ -437,10 +427,10 @@
 	CONFIG tmpCfg; /* if we want to alter config to suit our needs, it shouldn't be visible to user later */
 	memcpy(&tmpCfg, &codec->config, sizeof(CONFIG));
 
-	if (init_dll() != 0) return ICERR_ERROR;
+	if (init_dll(codec) != 0) return ICERR_ERROR;
 	/* destroy previously created codec */
 	if(codec->ehandle) {
-		xvid_encore_func(codec->ehandle, XVID_ENC_DESTROY, NULL, NULL);
+		codec->xvid_encore_func(codec->ehandle, XVID_ENC_DESTROY, NULL, NULL);
 		codec->ehandle = NULL;
 	}
 
@@ -448,7 +438,7 @@
 	init.version = XVID_VERSION;
 	init.cpu_flags = codec->config.cpu;
 	init.debug = codec->config.debug;
-	xvid_global_func(0, XVID_GBL_INIT, &init, NULL);
+	codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);
 
 	memset(&create, 0, sizeof(create));
 	create.version = XVID_VERSION;
@@ -464,7 +454,7 @@
 		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_func;
+		plugins[create.num_plugins].func = codec->xvid_plugin_single_func;
 		plugins[create.num_plugins].param = &single;
 		create.num_plugins++;
 		if (!codec->config.use_2pass_bitrate) /* constant-quant mode */
@@ -477,7 +467,7 @@
 		pass1.filename = codec->config.stats;
 		if (codec->config.full1pass)
 			prepare_full1pass_zones(&tmpCfg);
-		plugins[create.num_plugins].func = xvid_plugin_2pass1_func;
+		plugins[create.num_plugins].func = codec->xvid_plugin_2pass1_func;
 		plugins[create.num_plugins].param = &pass1;
 		create.num_plugins++;
 		break;
@@ -512,7 +502,7 @@
 		pass2.kfthreshold = codec->config.kfthreshold;
 		pass2.container_frame_overhead = 24;	/* AVI */
 
-		plugins[create.num_plugins].func = xvid_plugin_2pass2_func;
+		plugins[create.num_plugins].func = codec->xvid_plugin_2pass2_func;
 		plugins[create.num_plugins].param = &pass2;
 		create.num_plugins++;
 		break;
@@ -541,7 +531,7 @@
 
 	/* lumimasking plugin */
   	if ((profiles[codec->config.profile].flags & PROFILE_ADAPTQUANT) && codec->config.lum_masking) {
-		plugins[create.num_plugins].func = xvid_plugin_lumimasking_func;
+		plugins[create.num_plugins].func = codec->xvid_plugin_lumimasking_func;
 		plugins[create.num_plugins].param = NULL;
 		create.num_plugins++; 
 	}
@@ -583,7 +573,7 @@
 
 	create.num_threads = codec->config.num_threads;
 
-	switch(xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))
+	switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))
 	{
 	case XVID_ERR_FAIL :	
 		return ICERR_ERROR;
@@ -598,6 +588,7 @@
 		return ICERR_UNSUPPORTED;
 	}
 
+	free(create.zones);
 	codec->ehandle = create.handle;
 	codec->framenum = 0;
 	codec->keyspacing = 0;
@@ -613,13 +604,11 @@
 
 LRESULT compress_end(CODEC * codec)
 {
-	if (m_hdll != NULL) {
+	if (codec->m_hdll != NULL) {
 		if (codec->ehandle != NULL) {
-			xvid_encore_func(codec->ehandle, XVID_ENC_DESTROY, NULL, NULL);
+			codec->xvid_encore_func(codec->ehandle, XVID_ENC_DESTROY, NULL, NULL);
 			codec->ehandle = NULL;
 		}
-		FreeLibrary(m_hdll);
-		m_hdll = NULL;
 	}
 
 	if (codec->config.display_status)
@@ -654,6 +643,8 @@
 }
 
 
+#define CALC_BI_STRIDE(width,bitcount)  ((((width * bitcount) + 31) & ~31) >> 3)
+
 LRESULT compress(CODEC * codec, ICCOMPRESS * icc)
 {
 	BITMAPINFOHEADER * inhdr = icc->lpbiInput;
@@ -722,6 +713,10 @@
 	frame.vop_flags |= XVID_VOP_HALFPEL;
 	frame.vop_flags |= XVID_VOP_HQACPRED;
 
+	if (codec->config.interlacing && codec->config.tff)
+		frame.vop_flags |= XVID_VOP_TOPFIELDFIRST;
+
+
 	if (codec->config.vop_debug) 
 		frame.vop_flags |= XVID_VOP_DEBUG;
 
@@ -783,7 +778,7 @@
 	}
 
 	frame.input.plane[0] = icc->lpInput;
-	frame.input.stride[0] = (((icc->lpbiInput->biWidth * icc->lpbiInput->biBitCount) + 31) & ~31) >> 3;
+	frame.input.stride[0] = CALC_BI_STRIDE(icc->lpbiInput->biWidth, icc->lpbiInput->biBitCount);
 
 	if ((frame.input.csp = get_colorspace(inhdr)) == XVID_CSP_NULL)
 		return ICERR_BADFORMAT;
@@ -816,7 +811,7 @@
 	memset(&stats, 0, sizeof(stats));
 	stats.version = XVID_VERSION;
 
-	length = xvid_encore_func(codec->ehandle, XVID_ENC_ENCODE, &frame, &stats);
+	length = codec->xvid_encore_func(codec->ehandle, XVID_ENC_ENCODE, &frame, &stats);
 	switch (length) 
 	{
 	case XVID_ERR_FAIL :	
@@ -936,7 +931,8 @@
 	outhdr->biPlanes = 1;
 	outhdr->biBitCount = 24;
 	outhdr->biCompression = BI_RGB;	/* sonic foundry vegas video v3 only supports BI_RGB */
-	outhdr->biSizeImage = outhdr->biWidth * outhdr->biHeight * outhdr->biBitCount;
+	outhdr->biSizeImage = outhdr->biHeight * CALC_BI_STRIDE(outhdr->biWidth, outhdr->biBitCount);
+
 	outhdr->biXPelsPerMeter = 0;
 	outhdr->biYPelsPerMeter = 0;
 	outhdr->biClrUsed = 0;
@@ -959,19 +955,19 @@
 	xvid_dec_create_t create;
 	HKEY hKey;
 
-	if (init_dll() != 0) return ICERR_ERROR;
+	if (init_dll(codec) != 0) return ICERR_ERROR;
 
 	memset(&init, 0, sizeof(init));
 	init.version = XVID_VERSION;
 	init.cpu_flags = codec->config.cpu;
-	xvid_global_func(0, XVID_GBL_INIT, &init, NULL);
+	codec->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_func(0, XVID_DEC_CREATE, &create, NULL)) 
+	switch(codec->xvid_decore_func(0, XVID_DEC_CREATE, &create, NULL)) 
 	{
 	case XVID_ERR_FAIL :
 		return ICERR_ERROR;
@@ -990,9 +986,11 @@
 
 	RegOpenKeyEx(XVID_REG_KEY, XVID_REG_PARENT "\\" XVID_REG_CHILD, 0, KEY_READ, &hKey);
 
+	REG_GET_N("Brightness", pp_brightness, 0);
 	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("Dering_Y",  pp_dry, 0)
+	REG_GET_N("Dering_UV", pp_druv, 0)
 	REG_GET_N("FilmEffect", pp_fe, 0)
 
 	RegCloseKey(hKey);
@@ -1003,13 +1001,11 @@
 
 LRESULT decompress_end(CODEC * codec)
 {
-	if (m_hdll != NULL) {
+	if (codec->m_hdll != NULL) {
 		if (codec->dhandle != NULL) {
-			xvid_decore_func(codec->dhandle, XVID_DEC_DESTROY, NULL, NULL);
+			codec->xvid_decore_func(codec->dhandle, XVID_DEC_DESTROY, NULL, NULL);
 			codec->dhandle = NULL;
 		}
-		FreeLibrary(m_hdll);
-		m_hdll = NULL;
 	}
 
 	return ICERR_OK;
@@ -1042,13 +1038,13 @@
 
 		convert.input.csp = get_colorspace(icd->lpbiInput);
 		convert.input.plane[0] = icd->lpInput;
-		convert.input.stride[0] = (((icd->lpbiInput->biWidth *icd->lpbiInput->biBitCount) + 31) & ~31) >> 3;  
+		convert.input.stride[0] = CALC_BI_STRIDE(icd->lpbiInput->biWidth, icd->lpbiInput->biBitCount);
 		if (convert.input.csp == XVID_CSP_I420 || convert.input.csp == XVID_CSP_YV12)
 			convert.input.stride[0] = (convert.input.stride[0]*2)/3;
 
 		convert.output.csp = get_colorspace(icd->lpbiOutput);
 		convert.output.plane[0] = icd->lpOutput;
-		convert.output.stride[0] = (((icd->lpbiOutput->biWidth *icd->lpbiOutput->biBitCount) + 31) & ~31) >> 3;
+		convert.output.stride[0] = CALC_BI_STRIDE(icd->lpbiOutput->biWidth, icd->lpbiOutput->biBitCount);
 		if (convert.output.csp == XVID_CSP_I420 || convert.output.csp == XVID_CSP_YV12)
 			convert.output.stride[0] = (convert.output.stride[0]*2)/3;
 
@@ -1057,7 +1053,7 @@
 		convert.interlacing = 0;
 		if (convert.input.csp == XVID_CSP_NULL ||
 			convert.output.csp == XVID_CSP_NULL ||
-			xvid_global_func(0, XVID_GBL_CONVERT, &convert, NULL) < 0)
+			codec->xvid_global_func(0, XVID_GBL_CONVERT, &convert, NULL) < 0)
 		{
 			 return ICERR_BADFORMAT;
 		}
@@ -1078,7 +1074,7 @@
 			return ICERR_BADFORMAT;
 		}
 		frame.output.plane[0] = icd->lpOutput;
-		frame.output.stride[0] = (((icd->lpbiOutput->biWidth * icd->lpbiOutput->biBitCount) + 31) & ~31) >> 3;
+		frame.output.stride[0] = CALC_BI_STRIDE(icd->lpbiOutput->biWidth, icd->lpbiOutput->biBitCount);
 		if (frame.output.csp == XVID_CSP_I420 || frame.output.csp == XVID_CSP_YV12)
 			frame.output.stride[0] = (frame.output.stride[0]*2)/3;
 	}
@@ -1089,10 +1085,13 @@
 
 	if (pp_dy)frame.general |= XVID_DEBLOCKY;
 	if (pp_duv) frame.general |= XVID_DEBLOCKUV;
-/*	if (pp_dr) frame.general |= XVID_DERING; */
+	if (pp_dry) frame.general |= XVID_DERINGY; 
+	if (pp_druv) frame.general |= XVID_DERINGUV; 
 	if (pp_fe) frame.general |= XVID_FILMEFFECT;
 
-	switch (xvid_decore_func(codec->dhandle, XVID_DEC_DECODE, &frame, NULL)) 
+	frame.brightness = pp_brightness;
+
+	switch (codec->xvid_decore_func(codec->dhandle, XVID_DEC_DECODE, &frame, NULL)) 
 	{
 	case XVID_ERR_FAIL :	
 		return ICERR_ERROR;