XviD Api4 driver from http://ed.gomez.free.fr/

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11438 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 1277 insertions, 0 deletions

diff --git a/libmpcodecs/vd_xvid4.c b/libmpcodecs/vd_xvid4.c
new file mode 100644
index 0000000000..7c200fc47b
--- /dev/null
+++ b/libmpcodecs/vd_xvid4.c
@@ -0,0 +1,247 @@
+/*****************************************************************************
+ *
+ *  - XviD 1.0 decoder module for mplayer/mencoder -
+ *
+ *  Copyright(C) 2003 Marco Belli <elcabesa@inwind.it>
+ *               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 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
+ *
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Includes
+ ****************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "config.h"
+#include "mp_msg.h"
+
+#ifdef HAVE_XVID4
+
+#include "vd_internal.h"
+#include "m_option.h"
+
+#include <xvid.h>
+
+/*****************************************************************************
+ * Configuration options
+ ****************************************************************************/
+
+static int do_dr2 = 1;
+
+m_option_t xvid_dec_opts[] = {
+	{ "dr2", &do_dr2, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{ "nodr2", &do_dr2, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+	{NULL, NULL, 0, 0, 0, 0, NULL}
+};
+
+/*****************************************************************************
+ * Module private data
+ ****************************************************************************/
+
+typedef struct {
+	int cs;
+	unsigned char img_type;
+	void* hdl;
+	mp_image_t* mpi;
+} priv_t;
+
+/*****************************************************************************
+ * Video decoder API function definitions
+ ****************************************************************************/
+
+/*============================================================================
+ * control - to set/get/query special features/parameters
+ *==========================================================================*/
+
+static int control(sh_video_t *sh,int cmd,void* arg,...)
+{
+	return(CONTROL_UNKNOWN);
+}
+
+/*============================================================================
+ * init - initialize the codec
+ *==========================================================================*/
+
+static int init(sh_video_t *sh)
+{
+	xvid_gbl_init_t xvid_ini;
+	xvid_dec_create_t dec_p;
+	priv_t* p;
+	int cs;
+
+	memset(&xvid_ini, 0, sizeof(xvid_gbl_init_t));
+	xvid_ini.version = XVID_VERSION;
+	memset(&dec_p, 0, sizeof(xvid_dec_create_t));
+	dec_p.version = XVID_VERSION;
+
+	if(!mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, IMGFMT_YV12))
+		return(0);
+
+	switch(sh->codec->outfmt[sh->outfmtidx]){
+	case IMGFMT_YV12:
+		/* We will use our own buffers, this speeds decoding avoiding
+		 * frame memcpy's overhead */
+		cs = (do_dr2)?XVID_CSP_INTERNAL:XVID_CSP_USER;
+		break;
+	case IMGFMT_YUY2:
+		cs = XVID_CSP_YUY2;
+		break;
+	case IMGFMT_UYVY:
+		cs = XVID_CSP_UYVY;
+		break;
+	case IMGFMT_I420: 
+	case IMGFMT_IYUV:
+		/* We will use our own buffers, this speeds decoding avoiding
+		 * frame memcpy's overhead */
+		cs = (do_dr2)?XVID_CSP_INTERNAL:XVID_CSP_USER;
+		break;
+	case IMGFMT_BGR15: 
+		cs = XVID_CSP_RGB555;
+		break;
+	case IMGFMT_BGR16: 
+		cs = XVID_CSP_RGB565;
+		break;
+	case IMGFMT_BGR32:
+		cs = XVID_CSP_BGRA;
+		break;
+	case IMGFMT_YVYU:
+		cs = XVID_CSP_YVYU;
+		break;
+	default:
+		mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Unsupported out_fmt: 0x%X\n",
+		       sh->codec->outfmt[sh->outfmtidx]);
+		return(0);
+	}
+
+	if(xvid_global(NULL, XVID_GBL_INIT, &xvid_ini, NULL))
+		return(0);
+
+	dec_p.width = sh->disp_w;
+	dec_p.height =  sh->disp_h;
+
+	if(xvid_decore(0, XVID_DEC_CREATE, &dec_p, NULL)<0) {
+		mp_msg(MSGT_DECVIDEO, MSGL_ERR, "XviD init failed\n");
+		return(0);
+	}
+
+	p = (priv_t*)malloc(sizeof(priv_t));
+	p->cs = cs;
+	p->hdl = dec_p.handle;
+	sh->context = p;
+
+	switch(cs) {
+	case XVID_CSP_INTERNAL:
+		p->img_type = MP_IMGTYPE_EXPORT;
+		break;
+	case XVID_CSP_USER:
+		p->img_type = MP_IMGTYPE_STATIC;
+		break;
+	default:
+		p->img_type = MP_IMGTYPE_TEMP;
+		break;
+	}
+
+	return(1);
+}
+
+/*============================================================================
+ * uninit - close the codec
+ *==========================================================================*/
+
+static void uninit(sh_video_t *sh){
+	priv_t* p = sh->context;
+	if(!p)
+		return;
+	xvid_decore(p->hdl,XVID_DEC_DESTROY, NULL, NULL);
+	free(p);
+}
+
+/*============================================================================
+ * decode - decode a frame from stream
+ *==========================================================================*/
+
+static mp_image_t* decode(sh_video_t *sh, void* data, int len, int flags)
+{
+	xvid_dec_frame_t dec;
+	priv_t* p = sh->context;
+
+	mp_image_t* mpi = mpcodecs_get_image(sh, p->img_type,
+					     MP_IMGFLAG_ACCEPT_STRIDE,
+					     sh->disp_w,sh->disp_h);
+
+	if(!data || !mpi || len <= 0)
+		return(NULL);
+
+	memset(&dec,0,sizeof(xvid_dec_frame_t));
+	dec.version = XVID_VERSION;
+
+	dec.bitstream = data;
+	dec.length = len;
+
+	dec.general |= XVID_LOWDELAY;
+
+	dec.output.csp = p->cs;   
+
+	if(p->cs != XVID_CSP_INTERNAL) {
+		dec.output.plane[0] = mpi->planes[0];
+		dec.output.plane[1] = mpi->planes[1];
+		dec.output.plane[2] = mpi->planes[2];
+
+		dec.output.stride[0] = mpi->stride[0]; 
+		dec.output.stride[1] = mpi->stride[1]; 
+		dec.output.stride[2] = mpi->stride[2];
+	}
+
+	if(xvid_decore(p->hdl, XVID_DEC_DECODE, &dec, NULL) < 0) {
+		mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Decoding error\n");
+		return(NULL);
+	}
+
+	if(p->cs == XVID_CSP_INTERNAL) {
+		mpi->planes[0] = dec.output.plane[0];
+		mpi->planes[1] = dec.output.plane[1];
+		mpi->planes[2] = dec.output.plane[2];
+
+		mpi->stride[0] = dec.output.stride[0];
+		mpi->stride[1] = dec.output.stride[1];
+		mpi->stride[2] = dec.output.stride[2];
+	}
+
+	return(mpi);
+}
+
+/*****************************************************************************
+ * Module structure definition
+ ****************************************************************************/
+
+static vd_info_t info = 
+{
+	"XviD 1.0 decoder",
+	"xvid",
+	"Marco Belli <elcabesa@inwind.it>, Edouard Gomez <ed.gomez@free.fr>",
+	"Marco Belli <elcabesa@inwind.it>, Edouard Gomez <ed.gomez@free.fr>",
+	"No Comment"
+};
+
+LIBVD_EXTERN(xvid)
+
+#endif  /* HAVE_XVID4 */
+
+/* Please do not change that tag comment.
+ * arch-tag: b7d654a5-76ea-4768-9713-2c791567fe7d mplayer xvid decoder module */
diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c
new file mode 100644
index 0000000000..20a8b9dc6e
--- /dev/null
+++ b/libmpcodecs/ve_xvid4.c
@@ -0,0 +1,1030 @@
+/*****************************************************************************
+ *
+ *  - XviD 1.0 export module for mplayer/mencoder -
+ *
+ *  Copyright(C) 2003 Marco Belli <elcabesa@inwind.it>
+ *               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 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
+ *
+ ****************************************************************************/
+
+/*****************************************************************************
+ * Includes
+ ****************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <math.h>
+#include <limits.h>
+
+#include "../config.h"
+#include "../mp_msg.h"
+
+#ifdef HAVE_XVID4
+
+#include "codec-cfg.h"
+#include "stream.h"
+#include "demuxer.h"
+#include "stheader.h"
+
+#include "muxer.h"
+
+#include "img_format.h"
+#include "mp_image.h"
+#include "vf.h"
+
+#include <xvid.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <limits.h>
+
+#include "m_option.h"
+
+#define XVID_FIRST_PASS_FILENAME "xvid-twopass.stats"
+#define FINE (!0)
+#define BAD (!FINE)
+
+/*****************************************************************************
+ * Configuration options
+ ****************************************************************************/
+
+static int xvidenc_bitrate = 0;
+static int xvidenc_pass = 0;
+static float xvidenc_quantizer = 0;
+
+static int xvidenc_packed = 0;
+static int xvidenc_closed_gop = 1;
+static int xvidenc_interlaced = 0;
+static int xvidenc_quarterpel = 0;
+static int xvidenc_gmc = 0;
+static int xvidenc_trellis = 0;
+static int xvidenc_cartoon = 0;
+static int xvidenc_hqacpred = 1;
+static int xvidenc_chromame = 0;
+static int xvidenc_vhq = 0;
+static int xvidenc_motion = 6;
+static int xvidenc_stats = 0;
+static int xvidenc_max_key_interval = 0;
+static int xvidenc_frame_drop_ratio = 0;
+static int xvidenc_greyscale = 0;
+
+static int xvidenc_max_bframes = 0;
+static int xvidenc_bquant_ratio = 150;
+static int xvidenc_bquant_offset = 100;
+static int xvidenc_bframe_threshold = 0;
+
+static int xvidenc_min_quant[3] = {2, 2, 2};
+static int xvidenc_max_quant[3] = {31, 31, 31};
+static char *xvidenc_intra_matrix_file = NULL;
+static char *xvidenc_inter_matrix_file = NULL;
+static char *xvidenc_quant_method = NULL;
+
+static int xvidenc_cbr_reaction_delay_factor = 0;
+static int xvidenc_cbr_averaging_period = 0;
+static int xvidenc_cbr_buffer = 0;
+
+static int xvidenc_vbr_keyframe_boost = 0;
+static int xvidenc_vbr_overflow_control_strength = 0;
+static int xvidenc_vbr_curve_compression_high = 0;
+static int xvidenc_vbr_curve_compression_low = 0;
+static int xvidenc_vbr_max_overflow_improvement = 0;
+static int xvidenc_vbr_max_overflow_degradation = 0;
+static int xvidenc_vbr_kfreduction = 0;
+static int xvidenc_vbr_min_key_interval = 0;
+static int xvidenc_vbr_container_frame_overhead = 0;
+
+static char *xvidenc_par = NULL;
+static int xvidenc_par_width = 0;
+static int xvidenc_par_height = 0;
+
+m_option_t xvidencopts_conf[] =
+{
+	/* Standard things mencoder should be able to treat directly */
+	{"bitrate", &xvidenc_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL},
+	{"pass", &xvidenc_pass, CONF_TYPE_INT, CONF_RANGE, 1, 2, NULL},
+	{"fixed_quant", &xvidenc_quantizer, CONF_TYPE_FLOAT, CONF_RANGE, 1, 31, NULL},
+
+	/* Features */
+	{"quant_type", &xvidenc_quant_method, CONF_TYPE_STRING, 0, 0, 0, NULL},
+	{"me_quality", &xvidenc_motion, CONF_TYPE_INT, CONF_RANGE, 0, 6, NULL},
+	{"chroma_me", &xvidenc_chromame, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"vhq", &xvidenc_vhq, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL},
+	{"max_bframes", &xvidenc_max_bframes, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL},
+	{"bquant_ratio", &xvidenc_bquant_ratio, CONF_TYPE_INT, CONF_RANGE, 0, 200, NULL},
+	{"bquant_offset", &xvidenc_bquant_offset, CONF_TYPE_INT, CONF_RANGE, 0, 200, NULL},
+	{"bf_threshold", &xvidenc_bframe_threshold, CONF_TYPE_INT, CONF_RANGE, -255, 255, NULL},
+	{"qpel", &xvidenc_quarterpel, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"gmc", &xvidenc_gmc, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"trellis", &xvidenc_trellis, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"packed", &xvidenc_packed, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"closed_gop", &xvidenc_closed_gop, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"interlaced", &xvidenc_interlaced, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"cartoon", &xvidenc_cartoon, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"hq_ac", &xvidenc_hqacpred, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"frame_drop_ratio", &xvidenc_frame_drop_ratio, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
+	{"max_key_interval", &xvidenc_max_key_interval, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
+	{"greyscale", &xvidenc_greyscale, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"stats", &xvidenc_stats, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+
+
+	/* section [quantizer] */
+	{"min_iquant", &xvidenc_min_quant[0], CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
+	{"max_iquant", &xvidenc_max_quant[0], CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
+	{"min_pquant", &xvidenc_min_quant[1], CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
+	{"max_pquant", &xvidenc_max_quant[1], CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
+	{"min_bquant", &xvidenc_min_quant[2], CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
+	{"max_bquant", &xvidenc_max_quant[2], CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
+	{"quant_intra_matrix", &xvidenc_intra_matrix_file, CONF_TYPE_STRING, 0, 0, 100, NULL},
+	{"quant_inter_matrix", &xvidenc_inter_matrix_file, CONF_TYPE_STRING, 0, 0, 100, NULL},
+
+	/* section [cbr] */
+	{"cbr_reaction_delay_factor", &xvidenc_cbr_reaction_delay_factor, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
+	{"cbr_averaging_period", &xvidenc_cbr_averaging_period, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
+	{"cbr_buffer", &xvidenc_cbr_buffer, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
+
+	/* section [vbr] */
+	{"keyframe_boost", &xvidenc_vbr_keyframe_boost, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
+	{"curve_compression_high", &xvidenc_vbr_curve_compression_high, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
+	{"curve_compression_low", &xvidenc_vbr_curve_compression_low, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
+	{"overflow_control_strength", &xvidenc_vbr_overflow_control_strength, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
+	{"max_overflow_improvement", &xvidenc_vbr_max_overflow_improvement, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
+	{"max_overflow_degradation", &xvidenc_vbr_max_overflow_degradation, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
+	{"kfreduction", &xvidenc_vbr_kfreduction, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
+	{"min_key_interval", &xvidenc_vbr_min_key_interval, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
+	{"container_frame_overhead", &xvidenc_vbr_container_frame_overhead, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
+
+	/* Section Aspect Ratio */
+	{"par", &xvidenc_par, CONF_TYPE_STRING, 0, 0, 0, NULL},
+	{"par_width", &xvidenc_par_width, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
+	{"par_height", &xvidenc_par_height, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
+
+	/* End of the config array */
+	{NULL, 0, 0, 0, 0, 0, NULL}
+};
+
+/*****************************************************************************
+ * Module private data
+ ****************************************************************************/
+
+typedef struct _xvid_mplayer_module_t
+{
+	/* Instance related global vars */
+	void *instance;
+	xvid_gbl_init_t      init;
+	xvid_enc_create_t    create;
+	xvid_enc_frame_t     frame;
+	xvid_plugin_single_t onepass;
+	xvid_plugin_2pass1_t pass1;
+	xvid_plugin_2pass2_t pass2;
+
+	/* This data must survive local block scope, so here it is */
+	xvid_enc_plugin_t    plugins[7];
+	xvid_enc_zone_t      zones[1];
+
+	/* MPEG4 stream buffer */
+	muxer_stream_t *mux;
+
+	/* Stats accumulators */
+	int frames;
+	long long sse_y;
+	long long sse_u;
+	long long sse_v;
+
+	/* Min & Max PSNR */
+	int min_sse_y;
+	int min_sse_u;
+	int min_sse_v;
+	int max_sse_y;
+	int max_sse_u;
+	int max_sse_v;
+} xvid_mplayer_module_t;
+
+static void dispatch_settings(xvid_mplayer_module_t *mod);
+static int set_create_struct(xvid_mplayer_module_t *mod);
+static int set_frame_struct(xvid_mplayer_module_t *mod, mp_image_t *mpi);
+static const char *errorstring(int err);
+
+/*****************************************************************************
+ * Video Filter API function definitions
+ ****************************************************************************/
+
+/*============================================================================
+ * config
+ *==========================================================================*/
+
+static int
+config(struct vf_instance_s* vf,
+       int width, int height, int d_width, int d_height,
+       unsigned int flags, unsigned int outfmt)
+{
+	int err;
+	xvid_mplayer_module_t *mod = (xvid_mplayer_module_t *)vf->priv;
+	
+	/* Complete the muxer initialization */
+	mod->mux->bih->biWidth = width;
+	mod->mux->bih->biHeight = height;
+	mod->mux->bih->biSizeImage = 
+		mod->mux->bih->biWidth * mod->mux->bih->biHeight * 3;
+
+	/* Message the FourCC type */
+	mp_msg(MSGT_MENCODER, MSGL_INFO,
+	       "videocodec: XviD (%dx%d fourcc=%x [%.4s])\n",
+	       width, height, mod->mux->bih->biCompression,
+	       (char *)&mod->mux->bih->biCompression);
+
+	/*--------------------------------------------------------------------
+	 * Dispatch all module settings to XviD structures
+	 *------------------------------------------------------------------*/
+
+	dispatch_settings(mod);
+
+	/*--------------------------------------------------------------------
+	 * Set remaining information in the xvid_enc_create_t structure
+	 *------------------------------------------------------------------*/
+
+	if(set_create_struct(mod) == BAD)
+		return(BAD);
+
+	/*--------------------------------------------------------------------
+	 * Encoder instance creation
+	 *------------------------------------------------------------------*/
+
+	err = xvid_encore(NULL, XVID_ENC_CREATE, &mod->create, NULL);
+
+	if(err<0) {
+		mp_msg(MSGT_MENCODER, MSGL_ERR,
+		       "xvid: xvidcore returned a '%s' error\n", errorstring(err));
+		return(BAD);
+	}
+	
+	/* Store the encoder instance into the private data */
+	mod->instance = mod->create.handle;
+
+	return(FINE);
+}
+
+/*============================================================================
+ * uninit
+ *==========================================================================*/
+
+static void
+uninit(struct vf_instance_s* vf)
+{
+
+	xvid_mplayer_module_t *mod = (xvid_mplayer_module_t *)vf->priv;
+
+	/* Destroy xvid instance */
+	xvid_encore(mod->instance, XVID_ENC_DESTROY, NULL, NULL);
+
+	/* Display stats */
+	if(mod->frames) {
+		int pixels;
+
+		mod->sse_y /= mod->frames;
+		mod->sse_u /= mod->frames;
+		mod->sse_v /= mod->frames;
+
+		pixels = mod->create.width*mod->create.height;
+
+#define SSE2PSNR(sse, nbpixels) \
+((!(sse)) ? 99.99f : 48.131f - 10*(double)log10((double)(sse)/(double)((nbpixels))))
+		mp_msg(MSGT_MENCODER, MSGL_INFO,
+		       "The value 99.99dB is a special value and represents "
+		       "the upper range limit\n");
+		mp_msg(MSGT_MENCODER, MSGL_INFO,
+		       "xvid:     Min PSNR y : %.2f dB, u : %.2f dB, v : %.2f dB\n",
+		       SSE2PSNR(mod->max_sse_y, pixels),
+		       SSE2PSNR(mod->max_sse_u, pixels/4),
+		       SSE2PSNR(mod->max_sse_v, pixels/4));
+		mp_msg(MSGT_MENCODER, MSGL_INFO,
+		       "xvid: Average PSNR y : %.2f dB, u : %.2f dB, v : %.2f dB\n",
+		       SSE2PSNR(mod->sse_y, pixels),
+		       SSE2PSNR(mod->sse_u, pixels/4),
+		       SSE2PSNR(mod->sse_v, pixels/4));
+		mp_msg(MSGT_MENCODER, MSGL_INFO,
+		       "xvid:     Max PSNR y : %.2f dB, u : %.2f dB, v : %.2f dB\n",
+		       SSE2PSNR(mod->min_sse_y, pixels),
+		       SSE2PSNR(mod->min_sse_u, pixels/4),
+		       SSE2PSNR(mod->min_sse_v, pixels/4));
+	}
+#undef SSE2PSNR
+
+	/* ToDo: free matrices, and some string settings (quant method, matrix
+	 * filenames...) */
+
+	return;
+}
+
+/*============================================================================
+ * control
+ *==========================================================================*/
+
+static int
+control(struct vf_instance_s* vf, int request, void* data)
+{
+	return(CONTROL_UNKNOWN);
+}
+
+/*============================================================================
+ * query_format
+ *==========================================================================*/
+
+static int
+query_format(struct vf_instance_s* vf, unsigned int fmt)
+{
+	switch(fmt){
+	case IMGFMT_YV12:
+	case IMGFMT_IYUV:
+	case IMGFMT_I420:
+		return(VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW);
+	case IMGFMT_YUY2:
+	case IMGFMT_UYVY:
+		return(VFCAP_CSP_SUPPORTED);
+	}
+	return(BAD);
+}
+
+/*============================================================================
+ * put_image
+ *==========================================================================*/
+
+static int
+put_image(struct vf_instance_s* vf, mp_image_t *mpi)
+{
+	int size;
+	xvid_enc_stats_t stats; 
+	xvid_mplayer_module_t *mod = (xvid_mplayer_module_t *)vf->priv;
+
+	/* Prepare the stats */
+	memset(&stats,0,sizeof( xvid_enc_stats_t));
+	stats.version = XVID_VERSION;
+
+	/* -------------------------------------------------------------------
+	 * Set remaining information in the xvid_enc_frame_t structure
+	 * NB: all the other struct members were initialized by
+	 *     dispatch_settings
+	 * -----------------------------------------------------------------*/
+
+	if(set_frame_struct(mod, mpi) == BAD)
+		return(BAD);
+
+	/* -------------------------------------------------------------------
+	 * Encode the frame
+	 * ---------------------------------------------------------------- */
+
+	size = xvid_encore(mod->instance, XVID_ENC_ENCODE, &mod->frame, &stats);
+
+	/* Analyse the returned value */
+	if(size<0) {
+		mp_msg(MSGT_MENCODER, MSGL_ERR,
+		       "xvid: xvidcore returned a '%s' error\n", errorstring(size));
+		return(BAD);
+	}
+
+	/* If size is == 0, we're done with that frame */
+	if(size == 0) return(FINE);
+
+	/* Did xvidcore returned stats about an ecoded frame ? (asynchrone) */
+	if(xvidenc_stats && stats.type > 0) {
+		mod->frames++;
+		mod->sse_y += stats.sse_y;
+		mod->sse_u += stats.sse_u;
+		mod->sse_v += stats.sse_v;
+
+		if(mod->min_sse_y > stats.sse_y) {
+			mod->min_sse_y = stats.sse_y;
+			mod->min_sse_u = stats.sse_u;
+			mod->min_sse_v = stats.sse_v;
+		}
+
+		if(mod->max_sse_y < stats.sse_y) {
+			mod->max_sse_y = stats.sse_y;
+			mod->max_sse_u = stats.sse_u;
+			mod->max_sse_v = stats.sse_v;
+		}
+	}
+
+	/* xvidcore outputed bitstream -- mux it */
+	muxer_write_chunk(mod->mux,
+			  size,
+			  (mod->frame.out_flags & XVID_KEYFRAME)?0x10:0);
+
+	return(FINE);
+}
+
+/*============================================================================
+ * vf_open
+ *==========================================================================*/
+
+static int
+vf_open(vf_instance_t *vf, char* args)
+{
+	xvid_mplayer_module_t *mod;
+	xvid_gbl_init_t xvid_gbl_init;
+	xvid_gbl_info_t xvid_gbl_info;
+
+	/* Setting libmpcodec module API pointers */
+	vf->config       = config;
+	vf->control      = control;
+	vf->uninit       = uninit;
+	vf->query_format = query_format;
+	vf->put_image    = put_image;
+
+	/* Allocate the private part of the codec module */
+	vf->priv = malloc(sizeof(xvid_mplayer_module_t));
+	mod = (xvid_mplayer_module_t*)vf->priv;
+
+	if(mod == NULL) {
+		mp_msg(MSGT_MENCODER,MSGL_ERR,
+		       "xvid: memory allocation failure (private data)\n");
+		return(BAD);
+	}
+
+	/* Initialize the module to zeros */
+	memset(mod, 0, sizeof(xvid_mplayer_module_t));
+	mod->min_sse_y = mod->min_sse_u = mod->min_sse_v = INT_MAX;
+	mod->max_sse_y = mod->max_sse_u = mod->max_sse_v = INT_MIN;
+
+	/* Bind the Muxer */
+	mod->mux = (muxer_stream_t*)args;
+
+	/* Initialize muxer BITMAP header */
+	mod->mux->bih = malloc(sizeof(BITMAPINFOHEADER));
+
+	if(mod->mux->bih  == NULL) {
+		mp_msg(MSGT_MENCODER,MSGL_ERR,
+		       "xvid: memory allocation failure (BITMAP header)\n");
+		return(BAD);
+	}
+
+	mod->mux->bih->biSize = sizeof(BITMAPINFOHEADER);
+	mod->mux->bih->biWidth = 0;
+	mod->mux->bih->biHeight = 0;
+	mod->mux->bih->biPlanes = 1;
+	mod->mux->bih->biBitCount = 24;
+	mod->mux->bih->biCompression = mmioFOURCC('X','V','I','D');
+
+	/* Retrieve information about the host XviD library */
+	memset(&xvid_gbl_info, 0, sizeof(xvid_gbl_info_t));
+	xvid_gbl_info.version = XVID_VERSION;
+
+	if (xvid_global(NULL, XVID_GBL_INFO, &xvid_gbl_info, NULL) < 0) {
+		mp_msg(MSGT_MENCODER,MSGL_INFO, "xvid: could not get information about the library\n");
+	} else {
+		mp_msg(MSGT_MENCODER,MSGL_INFO, "xvid: using library version %d.%d.%d (build %s)\n",
+		       XVID_VERSION_MAJOR(xvid_gbl_info.actual_version),
+		       XVID_VERSION_MINOR(xvid_gbl_info.actual_version),
+		       XVID_VERSION_PATCH(xvid_gbl_info.actual_version),
+		       xvid_gbl_info.build);
+	}
+		
+	/* Initialize the xvid_gbl_init structure */
+	memset(&xvid_gbl_init, 0, sizeof(xvid_gbl_init_t));
+	xvid_gbl_init.version = XVID_VERSION;
+
+	/* Initialize the xvidcore library */
+	if (xvid_global(NULL, XVID_GBL_INIT, &xvid_gbl_init, NULL) < 0) {
+		mp_msg(MSGT_MENCODER,MSGL_ERR, "xvid: initialisation failure\n");
+		return(BAD);
+	}
+
+	return(FINE);
+}
+
+/*****************************************************************************
+ * Helper functions
+ ****************************************************************************/
+
+static void *read_matrix(unsigned char *filename);
+
+static void dispatch_settings(xvid_mplayer_module_t *mod)
+{
+	xvid_enc_create_t *create     = &mod->create;
+	xvid_enc_frame_t  *frame      = &mod->frame;
+	xvid_plugin_single_t *onepass = &mod->onepass;
+	xvid_plugin_2pass2_t *pass2   = &mod->pass2;
+
+	const int motion_presets[7] =
+		{
+			0,
+			0,
+			0,
+			0,
+			XVID_ME_HALFPELREFINE16,
+			XVID_ME_HALFPELREFINE16 | XVID_ME_ADVANCEDDIAMOND16,
+			XVID_ME_HALFPELREFINE16 | XVID_ME_EXTSEARCH16 |
+			XVID_ME_HALFPELREFINE8  | XVID_ME_USESQUARES16
+		};
+
+	
+	/* -------------------------------------------------------------------
+	 * Dispatch all settings having an impact on the "create" structure
+	 * This includes plugins as they are passed to encore through the
+	 * create structure
+	 * -----------------------------------------------------------------*/
+
+	/* -------------------------------------------------------------------
+	 * The create structure
+	 * ---------------------------------------------------------------- */
+
+	create->global = 0;
+
+	if(xvidenc_packed)
+		create->global |= XVID_GLOBAL_PACKED;
+
+	if(xvidenc_closed_gop)
+		create->global |= XVID_GLOBAL_CLOSED_GOP;
+
+	if(xvidenc_stats)
+		create->global |= XVID_GLOBAL_EXTRASTATS_ENABLE;
+
+	create->num_zones = 0;
+	create->zones = NULL;
+	create->num_plugins = 0;
+	create->plugins = NULL;
+	create->num_threads = 0;
+	create->max_bframes = xvidenc_max_bframes;
+	create->bquant_ratio = xvidenc_bquant_ratio;
+	create->bquant_offset = xvidenc_bquant_offset;
+	create->max_key_interval = xvidenc_max_key_interval;
+	create->frame_drop_ratio = xvidenc_frame_drop_ratio;
+	create->min_quant[0] = xvidenc_min_quant[0];
+	create->min_quant[1] = xvidenc_min_quant[1];
+	create->min_quant[2] = xvidenc_min_quant[2];
+	create->max_quant[0] = xvidenc_max_quant[0];
+	create->max_quant[1] = xvidenc_max_quant[1];
+	create->max_quant[2] = xvidenc_max_quant[2];
+
+
+	/* -------------------------------------------------------------------
+	 * The single pass plugin
+	 * ---------------------------------------------------------------- */
+
+	onepass->bitrate = xvidenc_bitrate;
+	onepass->reaction_delay_factor = xvidenc_cbr_reaction_delay_factor;
+	onepass->averaging_period = xvidenc_cbr_averaging_period;
+	onepass->buffer = xvidenc_cbr_buffer;
+
+	/* -------------------------------------------------------------------
+	 * The pass2 plugin
+	 * ---------------------------------------------------------------- */
+
+	pass2->keyframe_boost = xvidenc_vbr_keyframe_boost;
+	pass2->overflow_control_strength = xvidenc_vbr_overflow_control_strength;
+	pass2->curve_compression_high = xvidenc_vbr_curve_compression_high;
+	pass2->curve_compression_low = xvidenc_vbr_curve_compression_low;
+	pass2->max_overflow_improvement = xvidenc_vbr_max_overflow_improvement;
+	pass2->max_overflow_degradation = xvidenc_vbr_max_overflow_degradation;
+	pass2->kfreduction = xvidenc_vbr_kfreduction;
+	pass2->min_key_interval = xvidenc_vbr_min_key_interval;
+	pass2->container_frame_overhead = xvidenc_vbr_container_frame_overhead;
+
+	/* -------------------------------------------------------------------
+	 * The frame structure
+	 * ---------------------------------------------------------------- */
+	frame->vol_flags = 0;
+	frame->vop_flags = 0;
+	frame->motion    = 0;
+
+	frame->vop_flags |= XVID_VOP_HALFPEL;
+	frame->motion    |= motion_presets[xvidenc_motion];
+
+	if(xvidenc_stats)
+		frame->vol_flags |= XVID_VOL_EXTRASTATS;
+
+	if(xvidenc_greyscale)
+		frame->vop_flags |= XVID_VOP_GREYSCALE;
+
+	if(xvidenc_cartoon) {
+		frame->vop_flags |= XVID_VOP_CARTOON;
+		frame->motion |= XVID_ME_DETECT_STATIC_MOTION;
+	}
+
+	if(xvidenc_intra_matrix_file != NULL) {
+		frame->quant_intra_matrix = (unsigned char*)read_matrix(xvidenc_intra_matrix_file);
+		if(frame->quant_intra_matrix != NULL) {
+			fprintf(stderr, "xvid: Loaded Intra matrix (switching to mpeg quantization type)\n");
+			if(xvidenc_quant_method) free(xvidenc_quant_method);
+			xvidenc_quant_method = strdup("mpeg");
+		}
+	}
+	if(xvidenc_inter_matrix_file != NULL) {
+		frame->quant_inter_matrix = read_matrix(xvidenc_inter_matrix_file);
+		if(frame->quant_inter_matrix) {
+			fprintf(stderr, "\nxvid: Loaded Inter matrix (switching to mpeg quantization type)\n");
+			if(xvidenc_quant_method) free(xvidenc_quant_method);
+			xvidenc_quant_method = strdup("mpeg");
+		}
+	}
+	if(xvidenc_quant_method != NULL && !strcasecmp(xvidenc_quant_method, "mpeg")) {
+		frame->vol_flags |= XVID_VOL_MPEGQUANT;
+	}
+	if(xvidenc_quarterpel) {
+		frame->vol_flags |= XVID_VOL_QUARTERPEL;
+		frame->motion    |= XVID_ME_QUARTERPELREFINE16;
+		frame->motion    |= XVID_ME_QUARTERPELREFINE8;
+	}
+	if(xvidenc_gmc) {
+		frame->vol_flags |= XVID_VOL_GMC;
+		frame->motion    |= XVID_ME_GME_REFINE;
+	}
+	if(xvidenc_interlaced) {
+		frame->vol_flags |= XVID_VOL_INTERLACING;
+	}
+	if(xvidenc_trellis) {
+		frame->vop_flags |= XVID_VOP_TRELLISQUANT;
+	}
+	if(xvidenc_hqacpred) {
+		frame->vop_flags |= XVID_VOP_HQACPRED;
+	}
+	if(xvidenc_motion > 4) {
+		frame->vop_flags |= XVID_VOP_INTER4V;
+	}
+	if(xvidenc_chromame) {
+		frame->motion |= XVID_ME_CHROMA_PVOP;
+		frame->motion |= XVID_ME_CHROMA_BVOP;
+	}
+	if(xvidenc_vhq >= 1) {
+		frame->vop_flags |= XVID_VOP_MODEDECISION_RD;
+	}
+	if(xvidenc_vhq >= 2) {
+		frame->motion |= XVID_ME_HALFPELREFINE16_RD;
+		frame->motion |= XVID_ME_QUARTERPELREFINE16_RD;
+	}
+	if(xvidenc_vhq >= 3) {
+		frame->motion |= XVID_ME_HALFPELREFINE8_RD;
+		frame->motion |= XVID_ME_QUARTERPELREFINE8_RD;
+		frame->motion |= XVID_ME_CHECKPREDICTION_RD;
+	}
+	if(xvidenc_vhq >= 4) {
+		frame->motion |= XVID_ME_EXTSEARCH_RD;
+	}
+
+	/* motion level == 0 means no motion search which is equivalent to
+	 * intra coding only */
+	if(xvidenc_motion == 0) {
+		frame->type = XVID_TYPE_IVOP;
+	} else {
+		frame->type = XVID_TYPE_AUTO;
+	}
+
+	frame->bframe_threshold = xvidenc_bframe_threshold;
+
+	frame->par = 0;
+	if(xvidenc_par != NULL) {
+		if(strcasecmp(xvidenc_par, "pal43") == 0)
+			frame->par = XVID_PAR_43_PAL;
+		if(strcasecmp(xvidenc_par, "pal169") == 0)
+			frame->par = XVID_PAR_169_PAL;
+		if(strcasecmp(xvidenc_par, "ntsc43") == 0)
+			frame->par = XVID_PAR_43_NTSC;
+		if(strcasecmp(xvidenc_par, "ntsc169") == 0)
+			frame->par = XVID_PAR_169_NTSC;
+		if(strcasecmp(xvidenc_par, "ext") == 0)
+			frame->par = XVID_PAR_EXT;
+	}
+	if(frame->par == 0) {
+		frame->par = XVID_PAR_11_VGA;
+	}
+	if(frame->par == XVID_PAR_EXT) {
+		if(xvidenc_par_width)
+			frame->par_width = xvidenc_par_width;
+		else
+			frame->par_width = 1;
+
+		if(xvidenc_par_height)
+			frame->par_height = xvidenc_par_height;
+		else
+			frame->par_height = 1;
+	}
+
+	return;
+}
+
+static int set_create_struct(xvid_mplayer_module_t *mod)
+{
+	int pass;
+	xvid_enc_create_t *create    = &mod->create;
+
+	/* Most of the structure is initialized by dispatch settings, only a
+	 * few things are missing  */
+	create->version = XVID_VERSION;
+
+	/* Width and Height */
+	create->width  = mod->mux->bih->biWidth;
+	create->height = mod->mux->bih->biHeight;
+
+	/* FPS */
+	create->fincr = mod->mux->h.dwScale;
+	create->fbase = mod->mux->h.dwRate;
+
+	/* Encodings zones */
+	memset(mod->zones, 0, sizeof(mod->zones));
+	create->zones     = mod->zones;
+	create->num_zones = 0;
+
+	/* Plugins */
+	memset(mod->plugins, 0, sizeof(mod->plugins));
+	create->plugins     = mod->plugins;
+	create->num_plugins = 0;
+
+	/* -------------------------------------------------------------------
+	 * Initialize and bind the right rate controller plugin
+	 * ---------------------------------------------------------------- */
+
+	/* First we try to sort out co