Add mpeg2_flags to mp_image_t, copy flags in vd_libmpeg2.c,

and add vf_softpulldown.c.


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

1 files changed, 160 insertions, 0 deletions

diff --git a/libmpcodecs/vf_softpulldown.c b/libmpcodecs/vf_softpulldown.c
new file mode 100644
index 0000000000..909a22bc50
--- /dev/null
+++ b/libmpcodecs/vf_softpulldown.c
@@ -0,0 +1,160 @@
+#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"
+#include "../libvo/sub.h"
+
+struct vf_priv_s {
+	int state;
+	long long in;
+	long long out;
+};
+
+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 int put_image(struct vf_instance_s* vf, mp_image_t *mpi)
+{
+	mp_image_t *dmpi;
+	int ret = 0;
+	int flags = mpi->mpeg2_flags;
+	int state = vf->priv->state;
+
+	dmpi = vf_get_image(vf->next, mpi->imgfmt,
+	                    MP_IMGTYPE_STATIC, MP_IMGFLAG_ACCEPT_STRIDE |
+	                    MP_IMGFLAG_PRESERVE, mpi->width, mpi->height);
+
+	vf->priv->in++;
+
+	if ((state == 0 &&
+	     !(flags & MP_IMGMPEG2FLAG_TOP_FIELD_FIRST)) ||
+	    (state == 1 &&
+	     flags & MP_IMGMPEG2FLAG_TOP_FIELD_FIRST))
+		mp_msg(MSGT_VFILTER, MSGL_WARN,
+		       "softpulldown: Unexpected mpeg2 flags: state=%d top_field_first=%d repeat_first_field=%d\n",
+		       state,
+		       (flags & MP_IMGMPEG2FLAG_TOP_FIELD_FIRST) == 1,
+		       (flags & MP_IMGMPEG2FLAG_REPEAT_FIRST_FIELD) == 1);
+
+	if (state == 0) {
+		ret = vf_next_put_image(vf, mpi);
+		vf->priv->out++;
+		if (flags & MP_IMGMPEG2FLAG_REPEAT_FIRST_FIELD) {
+			my_memcpy_pic(dmpi->planes[0],
+			           mpi->planes[0], mpi->w, mpi->h/2,
+			           dmpi->stride[0]*2, mpi->stride[0]*2);
+			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);
+			}
+			state=1;
+		}
+	} else {
+		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);
+		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);
+		}
+		ret = vf_next_put_image(vf, dmpi);
+		vf->priv->out++;
+		if (flags & MP_IMGMPEG2FLAG_REPEAT_FIRST_FIELD) {
+			ret |= vf_next_put_image(vf, mpi);
+			vf->priv->out++;
+			state=0;
+		} else {
+			my_memcpy_pic(dmpi->planes[0],
+			              mpi->planes[0], mpi->w, mpi->h/2,
+			              dmpi->stride[0]*2, mpi->stride[0]*2);
+			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);
+			}
+		}
+	}
+
+	vf->priv->state = state;
+
+	return ret;
+}
+
+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 void uninit(struct vf_instance_s* vf)
+{
+	mp_msg(MSGT_VFILTER, MSGL_INFO, "softpulldown: %lld frames in, %lld frames out\n", vf->priv->in, vf->priv->out);
+	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->uninit = uninit;
+	vf->default_reqs = VFCAP_ACCEPT_STRIDE;
+	vf->priv = p = calloc(1, sizeof(struct vf_priv_s));
+	vf->priv->state = 0;
+	return 1;
+}
+
+vf_info_t vf_info_softpulldown = {
+    "mpeg2 soft 3:2 pulldown",
+    "softpulldown",
+    "Tobias Diedrich",
+    "",
+    open,
+    NULL
+};