new filter

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

3 files changed, 190 insertions, 1 deletions

diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 7c4ca51844..0c9adcc62a 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -14,7 +14,7 @@ VIDEO_SRCS_NAT=vd_null.c vd_cinepak.c vd_qtrpza.c vd_raw.c vd_msvidc.c vd_fli.c
 VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_dmo.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_xanim.c vd_xvid.c vd_libdv.c vd_qtvideo.c
 VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT)
 
-VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c
+VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c
 ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c ve_xvid.c ve_qtvideo.c
 
 NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/fli.c native/minilzo.c native/msvidc.c native/nuppelvideo.c native/qtrle.c native/qtrpza.c native/qtsmc.c native/roqav.c native/xa_gsm.c native/svq1.c
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index a598a8248e..929f66cae8 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -58,6 +58,7 @@ extern vf_info_t vf_info_denoise3d;
 extern vf_info_t vf_info_hqdn3d;
 extern vf_info_t vf_info_detc;
 extern vf_info_t vf_info_telecine;
+extern vf_info_t vf_info_tfields;
 
 char** vo_plugin_args=(char**) NULL;
 
@@ -109,6 +110,7 @@ static vf_info_t* filter_list[]={
     &vf_info_hqdn3d,
     &vf_info_detc,
     &vf_info_telecine,
+    &vf_info_tfields,
     NULL
 };
 
diff --git a/libmpcodecs/vf_tfields.c b/libmpcodecs/vf_tfields.c
new file mode 100644
index 0000000000..635fa405f8
--- /dev/null
+++ b/libmpcodecs/vf_tfields.c
@@ -0,0 +1,187 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "../config.h"
+#include "../mp_msg.h"
+
+#include "img_format.h"
+#include "mp_image.h"
+#include "vf.h"
+
+#include "../libvo/fastmemcpy.h"
+
+struct vf_priv_s {
+	int mode;
+};
+
+static inline void *my_memcpy_pic(void * dst, void * src, int bytesPerLine, int height, int dstStride, int srcStride)
+{
+	int i;
+	void *retval=dst;
+
+	for(i=0; i<height; i++)
+	{
+		memcpy(dst, src, bytesPerLine);
+		src+= srcStride;
+		dst+= dstStride;
+	}
+
+	return retval;
+}
+
+static void deint(unsigned char *dest, int ds, unsigned char *src, int ss, int w, int h, int field)
+{
+	int x, y;
+	src += ss;
+	dest += ds;
+	if (field) {
+		src += ss;
+		dest += ds;
+		h -= 2;
+	}
+	for (y=h/2; y; y--) {
+		for (x=0; x<w; x++) {
+			if (((src[x-ss] < src[x]) && (src[x+ss] < src[x])) ||
+				((src[x-ss] > src[x]) && (src[x+ss] > src[x]))) {
+				//dest[x] = (src[x+ss] + src[x-ss])>>1;
+				dest[x] = ((src[x+ss]<<1) + (src[x-ss]<<1)
+					+ src[x+ss+1] + src[x-ss+1]
+					+ src[x+ss-1] + src[x-ss-1])>>3;
+			}
+			else dest[x] = src[x];
+		}
+		dest += ds<<1;
+		src += ss<<1;
+	}
+}
+
+
+
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi)
+{
+	int ret;
+	mp_image_t *dmpi;
+
+	switch (vf->priv->mode) {
+	case 0:
+		dmpi = vf_get_image(vf->next, mpi->imgfmt,
+			MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
+			mpi->width, mpi->height/2);
+		memcpy_pic(dmpi->planes[0], mpi->planes[0], mpi->w, mpi->h/2,
+			dmpi->stride[0], mpi->stride[0]*2);
+		if (mpi->flags & MP_IMGFLAG_PLANAR) {
+			memcpy_pic(dmpi->planes[1], mpi->planes[1],
+				mpi->chroma_width, mpi->chroma_height/2,
+				dmpi->stride[1], mpi->stride[1]*2);
+			memcpy_pic(dmpi->planes[2], mpi->planes[2],
+				mpi->chroma_width, mpi->chroma_height/2,
+				dmpi->stride[2], mpi->stride[2]*2);
+		}
+		ret = vf_next_put_image(vf, dmpi);
+		
+		memcpy_pic(dmpi->planes[0], mpi->planes[0] + mpi->stride[0],
+			mpi->w, mpi->h/2, dmpi->stride[0], mpi->stride[0]*2);
+		if (mpi->flags & MP_IMGFLAG_PLANAR) {
+			memcpy_pic(dmpi->planes[1], mpi->planes[1] + mpi->stride[1],
+				mpi->chroma_width, mpi->chroma_height/2,
+				dmpi->stride[1], mpi->stride[1]*2);
+			memcpy_pic(dmpi->planes[2], mpi->planes[2] + mpi->stride[2],
+				mpi->chroma_width, mpi->chroma_height/2,
+				dmpi->stride[2], mpi->stride[2]*2);
+		}
+		return vf_next_put_image(vf, dmpi) || ret;
+	case 1:
+		dmpi = vf_get_image(vf->next, mpi->imgfmt,
+			MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
+			mpi->width, mpi->height);
+		my_memcpy_pic(dmpi->planes[0], mpi->planes[0], mpi->w, mpi->h/2,
+			dmpi->stride[0]*2, mpi->stride[0]*2);
+		deint(dmpi->planes[0], dmpi->stride[0], mpi->planes[0], mpi->stride[0], mpi->w, mpi->h, 0);
+		if (mpi->flags & MP_IMGFLAG_PLANAR) {
+			my_memcpy_pic(dmpi->planes[1], mpi->planes[1],
+				mpi->chroma_width, mpi->chroma_height/2,
+				dmpi->stride[1]*2, mpi->stride[1]*2);
+			my_memcpy_pic(dmpi->planes[2], mpi->planes[2],
+				mpi->chroma_width, mpi->chroma_height/2,
+				dmpi->stride[2]*2, mpi->stride[2]*2);
+			deint(dmpi->planes[1], dmpi->stride[1], mpi->planes[1], mpi->stride[1],
+				mpi->chroma_width, mpi->chroma_height, 0);
+			deint(dmpi->planes[2], dmpi->stride[2], mpi->planes[2], mpi->stride[2],
+				mpi->chroma_width, mpi->chroma_height, 0);
+		}
+		ret = vf_next_put_image(vf, dmpi);
+		
+		my_memcpy_pic(dmpi->planes[0] + dmpi->stride[0], mpi->planes[0] + mpi->stride[0],
+			mpi->w, mpi->h/2, dmpi->stride[0]*2, mpi->stride[0]*2);
+		deint(dmpi->planes[0], dmpi->stride[0], mpi->planes[0], mpi->stride[0], mpi->w, mpi->h, 1);
+		if (mpi->flags & MP_IMGFLAG_PLANAR) {
+			my_memcpy_pic(dmpi->planes[1] + dmpi->stride[1], mpi->planes[1] + mpi->stride[1],
+				mpi->chroma_width, mpi->chroma_height/2,
+				dmpi->stride[1]*2, mpi->stride[1]*2);
+			my_memcpy_pic(dmpi->planes[2] + dmpi->stride[2], mpi->planes[2] + mpi->stride[2],
+				mpi->chroma_width, mpi->chroma_height/2,
+				dmpi->stride[2]*2, mpi->stride[2]*2);
+			deint(dmpi->planes[1], dmpi->stride[1], mpi->planes[1], mpi->stride[1],
+				mpi->chroma_width, mpi->chroma_height, 1);
+			deint(dmpi->planes[2], dmpi->stride[2], mpi->planes[2], mpi->stride[2],
+				mpi->chroma_width, mpi->chroma_height, 1);
+		}
+		return vf_next_put_image(vf, dmpi) || ret;
+	}
+	return 0;
+}
+
+static int query_format(struct vf_instance_s* vf, unsigned int fmt)
+{
+	/* FIXME - figure out which other formats work */
+	switch (fmt) {
+	case IMGFMT_YV12:
+	case IMGFMT_IYUV:
+	case IMGFMT_I420:
+		return vf_next_query_format(vf, fmt);
+	}
+	return 0;
+}
+
+static int config(struct vf_instance_s* vf,
+        int width, int height, int d_width, int d_height,
+	unsigned int flags, unsigned int outfmt)
+{
+	switch (vf->priv->mode) {
+	case 0:
+		return vf_next_config(vf,width,height/2,d_width,d_height,flags,outfmt);
+	case 1:
+		return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
+	}
+	return 0;
+}
+
+static void uninit(struct vf_instance_s* vf)
+{
+	free(vf->priv);
+}
+
+static int open(vf_instance_t *vf, char* args)
+{
+	struct vf_priv_s *p;
+	vf->config = config;
+	vf->put_image = put_image;
+	vf->query_format = query_format;
+	vf->uninit = uninit;
+	vf->default_reqs = VFCAP_ACCEPT_STRIDE;
+	vf->priv = p = calloc(1, sizeof(struct vf_priv_s));
+	vf->priv->mode = 0;
+	if (args) sscanf(args, "%d", &vf->priv->mode);
+	return 1;
+}
+
+vf_info_t vf_info_tfields = {
+    "temporal field separation",
+    "tfields",
+    "Rich Felker",
+    "",
+    open
+};
+
+