(de)interleave filter (can be used to split/merge an interlaced image so other non interlaced filters an be used with idividual fields)

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

3 files changed, 167 insertions, 1 deletions

diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index e5e0b6f250..27e044934d 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -6,7 +6,7 @@ LIBNAME2 = libmpencoders.a
 
 AUDIO_SRCS=dec_audio.c ad.c ad_liba52.c ad_acm.c ad_alaw.c ad_dk3adpcm.c ad_dshow.c ad_dvdpcm.c ad_ffmpeg.c ad_hwac3.c ad_imaadpcm.c ad_mp3lib.c ad_msadpcm.c ad_pcm.c ad_roqaudio.c ad_msgsm.c ad_faad.c ad_libvorbis.c ad_libmad.c ad_realaud.c ad_libdv.c
 VIDEO_SRCS=dec_video.c vd.c vd_null.c vd_realvid.c vd_cinepak.c vd_qtrpza.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_raw.c vd_xanim.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_nuv.c vd_libmpeg2.c vd_msrle.c vd_huffyuv.c vd_mpegpes.c vd_svq1.c vd_xvid.c vd_libdv.c vd_lcl.c vd_mtga.c vd_lzo.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
+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
 ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c ve_xvid.c
 NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/cyuv.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 74ee5b23db..bcc310bdc4 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -47,6 +47,7 @@ extern vf_info_t vf_info_1bpp;
 extern vf_info_t vf_info_2xsai;
 extern vf_info_t vf_info_unsharp;
 extern vf_info_t vf_info_swapuv;
+extern vf_info_t vf_info_il;
 
 char** vo_plugin_args=(char**) NULL;
 
@@ -87,6 +88,7 @@ static vf_info_t* filter_list[]={
     &vf_info_2xsai,
     &vf_info_unsharp,
     &vf_info_swapuv,
+    &vf_info_il,
     NULL
 };
 
diff --git a/libmpcodecs/vf_il.c b/libmpcodecs/vf_il.c
new file mode 100644
index 0000000000..7d12e2e395
--- /dev/null
+++ b/libmpcodecs/vf_il.c
@@ -0,0 +1,164 @@
+/*
+    Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at>
+
+    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
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+#include <assert.h>
+
+#include "../config.h"
+#include "../mp_msg.h"
+
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+
+#include "img_format.h"
+#include "mp_image.h"
+#include "vf.h"
+#include "../libvo/fastmemcpy.h"
+
+
+//===========================================================================//
+
+
+struct vf_priv_s {
+	int interleave;
+	int chroma;
+	int swap;
+};
+
+
+/***************************************************************************/
+
+
+static int config(struct vf_instance_s* vf,
+        int width, int height, int d_width, int d_height,
+	unsigned int flags, unsigned int outfmt){
+
+	return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
+}
+
+static int interleave(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, int interleave, int swap){
+	const int a= swap;
+	const int b= 1-a;
+	const int m= h>>1;
+	int y;
+
+	switch(interleave){
+	case -1:
+		for(y=0; y < m; y++){
+			memcpy(dst + dstStride* y     , src + srcStride*(y*2 + a), w);
+			memcpy(dst + dstStride*(y + m), src + srcStride*(y*2 + b), w);
+		}
+		break;
+	case 0:
+		for(y=0; y < m; y++){
+			memcpy(dst + dstStride* y*2   , src + srcStride*(y*2 + a), w);
+			memcpy(dst + dstStride*(y*2+1), src + srcStride*(y*2 + b), w);
+		}
+		break;
+	case 1:
+		for(y=0; y < m; y++){
+			memcpy(dst + dstStride*(y*2+a), src + srcStride* y     , w);
+			memcpy(dst + dstStride*(y*2+b), src + srcStride*(y + m), w);
+		}
+		break;
+	}
+}
+
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+	int w;
+
+	mp_image_t *dmpi=vf_get_image(vf->next,mpi->imgfmt,
+		MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
+		mpi->w,mpi->h);
+
+	if(mpi->flags&MP_IMGFLAG_PLANAR)
+		w= mpi->w;
+	else
+		w= mpi->w * mpi->bpp/8;
+
+	interleave(dmpi->planes[0], mpi->planes[0], 
+		w, mpi->h, dmpi->stride[0], mpi->stride[0], vf->priv->interleave, vf->priv->swap);
+
+	if(mpi->flags&MP_IMGFLAG_PLANAR){
+		int cw= mpi->w >> mpi->chroma_x_shift;
+		int ch= mpi->h >> mpi->chroma_y_shift;
+
+	
+		if(vf->priv->chroma){
+			interleave(dmpi->planes[1], mpi->planes[1], cw,ch, 
+				dmpi->stride[1], mpi->stride[1], vf->priv->interleave, vf->priv->swap);
+			interleave(dmpi->planes[2], mpi->planes[2], cw,ch, 
+				dmpi->stride[2], mpi->stride[2], vf->priv->interleave, vf->priv->swap);
+		}else{
+			int y;
+			for(y=0; y < ch; y++)
+			    memcpy(dmpi->planes[1] + dmpi->stride[1]*y, mpi->planes[1] + mpi->stride[1]*y, cw);
+			for(y=0; y < ch; y++)
+			    memcpy(dmpi->planes[2] + dmpi->stride[2]*y, mpi->planes[2] + mpi->stride[2]*y, cw);
+		}
+	}
+    
+	return vf_next_put_image(vf,dmpi);
+}
+
+//===========================================================================//
+
+static int query_format(struct vf_instance_s* vf, unsigned int fmt){
+	/* we support all formats :) */
+	return vf_next_query_format(vf, fmt); 
+}
+
+static int open(vf_instance_t *vf, char* args){
+	char *pos, *max;
+
+	vf->config=config;
+	vf->put_image=put_image;
+//	vf->get_image=get_image;
+	vf->query_format=query_format;
+	vf->priv=malloc(sizeof(struct vf_priv_s));
+	memset(vf->priv, 0, sizeof(struct vf_priv_s));
+
+	if(args==NULL) return 0;
+
+	max= args + strlen(args);
+
+	pos= strchr(args, 's');
+	if(pos && pos<max) vf->priv->swap=1;
+	pos= strchr(args, 'c');
+	if(pos && pos<max) vf->priv->chroma=1;
+	pos= strchr(args, 'i');
+	if(pos && pos<max) vf->priv->interleave=1;
+	pos= strchr(args, 'd');
+	if(pos && pos<max) vf->priv->interleave=-1;
+
+	return 1;
+}
+
+vf_info_t vf_info_il = {
+    "(de)interleave",
+    "il",
+    "Michael Niedermayer",
+    "",
+    open
+};
+
+//===========================================================================//