new video filter to extract a single field using stride arithmetic,

i.e. without using cpu time


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

3 files changed, 77 insertions, 1 deletions

diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index f376015e30..040dc58ee5 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
+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_field.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/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 a4abda646d..37cae43040 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -52,6 +52,7 @@ extern vf_info_t vf_info_boxblur;
 extern vf_info_t vf_info_sab;
 extern vf_info_t vf_info_smartblur;
 extern vf_info_t vf_info_perspective;
+extern vf_info_t vf_info_field;
 
 char** vo_plugin_args=(char**) NULL;
 
@@ -97,6 +98,7 @@ static vf_info_t* filter_list[]={
     &vf_info_sab,
     &vf_info_smartblur,
     &vf_info_perspective,
+    &vf_info_field,
     NULL
 };
 
diff --git a/libmpcodecs/vf_field.c b/libmpcodecs/vf_field.c
new file mode 100644
index 0000000000..de321bf645
--- /dev/null
+++ b/libmpcodecs/vf_field.c
@@ -0,0 +1,74 @@
+#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 field;
+    mp_image_t *dmpi;
+};
+
+//===========================================================================//
+
+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/2,d_width,d_height,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->priv->dmpi=vf_get_image(vf->next,mpi->imgfmt,
+	MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE,
+	mpi->width, mpi->height/2);
+    
+    // set up mpi as a double-stride image of dmpi:
+    vf->priv->dmpi->planes[0]=mpi->planes[0]+mpi->stride[0]*vf->priv->field;
+    vf->priv->dmpi->stride[0]=2*mpi->stride[0];
+    if(vf->priv->dmpi->flags&MP_IMGFLAG_PLANAR){
+        vf->priv->dmpi->planes[1]=mpi->planes[1]+
+	    mpi->stride[1]*vf->priv->field;
+	vf->priv->dmpi->stride[1]=2*mpi->stride[1];
+        vf->priv->dmpi->planes[2]=mpi->planes[2]+
+	    mpi->stride[2]*vf->priv->field;
+	vf->priv->dmpi->stride[2]=2*mpi->stride[2];
+    } else
+	vf->priv->dmpi->planes[1]=mpi->planes[1]; // passthru bgr8 palette!!!
+    
+    return vf_next_put_image(vf,vf->priv->dmpi);
+}
+
+//===========================================================================//
+
+// FIXME - do we need to free dmpi on uninit?
+
+static int open(vf_instance_t *vf, char* args){
+    vf->config=config;
+    vf->put_image=put_image;
+    vf->default_reqs=VFCAP_ACCEPT_STRIDE;
+    vf->priv=calloc(1, sizeof(struct vf_priv_s));
+    if (args) sscanf(args, "%d", &vf->priv->field);
+    vf->priv->field &= 1;
+    return 1;
+}
+
+vf_info_t vf_info_field = {
+    "extract single field",
+    "field",
+    "Rich Felker",
+    "",
+    open
+};
+
+//===========================================================================//