fast deinterleaver (= il filter with stride/width/height tricks)

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

3 files changed, 103 insertions, 1 deletions

diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index a9fd5783dc..b4b2005a37 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_hmblck.c vd_msvidc
 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 vd_theora.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_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 vf_ivtc.c vf_ilpack.c vf_dsize.c vf_decimate.c vf_softpulldown.c vf_tinterlace.c vf_pullup.c pullup.c vf_framestep.c vf_tile.c vf_delogo.c
+VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.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 vf_ivtc.c vf_ilpack.c vf_dsize.c vf_decimate.c vf_softpulldown.c vf_tinterlace.c vf_pullup.c pullup.c vf_framestep.c vf_tile.c vf_delogo.c vf_fil.c
 ifeq ($(HAVE_FFPOSTPROCESS),yes)
 VFILTER_SRCS += vf_pp.c
 endif
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index aac1714c89..349efdd1b7 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -56,6 +56,7 @@ 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;
+extern vf_info_t vf_info_fil;
 extern vf_info_t vf_info_boxblur;
 extern vf_info_t vf_info_sab;
 extern vf_info_t vf_info_smartblur;
@@ -120,6 +121,7 @@ static vf_info_t* filter_list[]={
     &vf_info_unsharp,
     &vf_info_swapuv,
     &vf_info_il,
+    &vf_info_fil,
     &vf_info_boxblur,
     &vf_info_sab,
     &vf_info_smartblur,
diff --git a/libmpcodecs/vf_fil.c b/libmpcodecs/vf_fil.c
new file mode 100644
index 0000000000..ec14635b88
--- /dev/null
+++ b/libmpcodecs/vf_fil.c
@@ -0,0 +1,100 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "../config.h"
+#include "../mp_msg.h"
+
+#include "mp_image.h"
+#include "vf.h"
+
+#include "../libvo/fastmemcpy.h"
+
+struct vf_priv_s {
+    int interleave;
+    int height;
+    int width;
+    int stridefactor;
+};
+
+//===========================================================================//
+
+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 pixel_stride= (width+15)&~15; //FIXME this is ust a guess ... especially for non planar its somewhat bad one
+
+#if 0
+    if(mpi->flags&MP_IMGFLAG_PLANAR)
+        pixel_stride= mpi->stride[0];
+    else
+        pixel_stride= 8*mpi->stride[0] / mpi->bpp;
+        
+#endif        
+    
+    if(vf->priv->interleave){
+        vf->priv->height= 2*height;
+        vf->priv->width= width - (pixel_stride/2);
+        vf->priv->stridefactor=1;
+    }else{
+        vf->priv->height= height/2;
+        vf->priv->width= width + pixel_stride;
+        vf->priv->stridefactor=4;
+    }
+//printf("hX %d %d %d\n", vf->priv->width,vf->priv->height,vf->priv->stridefactor);
+
+    return vf_next_config(vf, vf->priv->width, vf->priv->height,
+        (d_width*vf->priv->stridefactor)>>1, 2*d_height/vf->priv->stridefactor, flags, outfmt);
+}
+
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+    if(mpi->flags&MP_IMGFLAG_DIRECT){
+	// we've used DR, so we're ready...
+	return vf_next_put_image(vf,(mp_image_t*)mpi->priv);
+    }
+
+    vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
+	MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE,
+	vf->priv->width, vf->priv->height);
+    
+    // set up mpi as a double-stride image of dmpi:
+    vf->dmpi->planes[0]=mpi->planes[0];
+    vf->dmpi->stride[0]=(mpi->stride[0]*vf->priv->stridefactor)>>1;
+    if(vf->dmpi->flags&MP_IMGFLAG_PLANAR){
+        vf->dmpi->planes[1]=mpi->planes[1];
+	vf->dmpi->stride[1]=(mpi->stride[1]*vf->priv->stridefactor)>>1;
+        vf->dmpi->planes[2]=mpi->planes[2];
+	vf->dmpi->stride[2]=(mpi->stride[2]*vf->priv->stridefactor)>>1;
+    } else
+	vf->dmpi->planes[1]=mpi->planes[1]; // passthru bgr8 palette!!!
+    
+    return vf_next_put_image(vf,vf->dmpi);
+}
+
+//===========================================================================//
+
+static void uninit(struct vf_instance_s* vf)
+{
+	free(vf->priv);
+}
+
+static int open(vf_instance_t *vf, char* args){
+    vf->config=config;
+    vf->put_image=put_image;
+    vf->uninit=uninit;
+    vf->default_reqs=VFCAP_ACCEPT_STRIDE;
+    vf->priv=calloc(1, sizeof(struct vf_priv_s));
+    vf->priv->interleave= args && (*args == 'i');
+    return 1;
+}
+
+vf_info_t vf_info_fil = {
+    "fast (de)interleaver",
+    "fil",
+    "Michael Niedermayer",
+    "",
+    open,
+    NULL
+};
+
+//===========================================================================//