[Mplayer-cvslog] CVS: main/libmpcodecs vd_xvid4.c,1.1,1.2

[Attila Kinali CVS]

CVS change done by Attila Kinali CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv6915/libmpcodecs

Modified Files:
	vd_xvid4.c 
Log Message:
Adds support for the film grain effect and deblocking filters in xvid 
patch by Jan Knutar <jknutar at nic.fi>


Index: vd_xvid4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_xvid4.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vd_xvid4.c	12 Nov 2003 00:50:43 -0000	1.1
+++ vd_xvid4.c	17 Feb 2004 12:52:19 -0000	1.2
@@ -43,10 +43,16 @@
  ****************************************************************************/
 
 static int do_dr2 = 1;
+static int filmeffect = 0;
+static int lumadeblock = 0;
+static int chromadeblock = 0;
 
 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},
+	{ "filmeffect", &filmeffect, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{ "deblock-luma", &lumadeblock, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{ "deblock-chroma", &chromadeblock, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
@@ -194,7 +200,10 @@
 	dec.bitstream = data;
 	dec.length = len;
 
-	dec.general |= XVID_LOWDELAY;
+	dec.general |= XVID_LOWDELAY 
+	        | (filmeffect ? XVID_FILMEFFECT : 0 )
+	        | (lumadeblock ? XVID_DEBLOCKY : 0 )
+	        | (chromadeblock ? XVID_DEBLOCKUV : 0 );
 
 	dec.output.csp = p->cs;