lavfi: remove telecine libmpcodecs wrapper

Native, with more features, filter is available.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index d28d3b1b4b8321babd0b3788274dc7695b666138..c736ad120529720a7d8201484186baa0c1f08174 100644 (file)
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -209,7 +209,6 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_qp.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_sab.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_softpulldown.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_spp.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_telecine.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_tinterlace.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_uspp.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o

diff --git a/libavfilter/libmpcodecs/vf_telecine.c b/libavfilter/libmpcodecs/vf_telecine.c
deleted file mode 100644 (file)
index 77f75f0..0000000
--- a/libavfilter/libmpcodecs/vf_telecine.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer 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.
- *
- * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#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 frame;
-};
-
-static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
-{
-    mp_image_t *dmpi;
-    int ret;
-    int w            = (IMGFMT_IS_YUVP16(mpi->imgfmt) ? 2 : 1) * mpi->w;
-    int chroma_width = (IMGFMT_IS_YUVP16(mpi->imgfmt) ? 2 : 1) * mpi->chroma_width;
-
-    vf->priv->frame = (vf->priv->frame+1)%4;
-
-    dmpi = ff_vf_get_image(vf->next, mpi->imgfmt,
-        MP_IMGTYPE_STATIC, MP_IMGFLAG_ACCEPT_STRIDE |
-        MP_IMGFLAG_PRESERVE, mpi->width, mpi->height);
-
-    ret = 0;
-    //    0/0  1/1  2/2  2/3  3/0
-    switch (vf->priv->frame) {
-    case 0:
-        my_memcpy_pic(dmpi->planes[0]+dmpi->stride[0],
-            mpi->planes[0]+mpi->stride[0], 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],
-                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],
-                chroma_width, mpi->chroma_height/2,
-                dmpi->stride[2]*2, mpi->stride[2]*2);
-        }
-        ret = ff_vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE);
-        /* Fallthrough */
-    case 1:
-    case 2:
-        memcpy_pic(dmpi->planes[0], mpi->planes[0], w, mpi->h,
-            dmpi->stride[0], mpi->stride[0]);
-        if (mpi->flags & MP_IMGFLAG_PLANAR) {
-            memcpy_pic(dmpi->planes[1], mpi->planes[1],
-                chroma_width, mpi->chroma_height,
-                dmpi->stride[1], mpi->stride[1]);
-            memcpy_pic(dmpi->planes[2], mpi->planes[2],
-                chroma_width, mpi->chroma_height,
-                dmpi->stride[2], mpi->stride[2]);
-        }
-        return ff_vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE) || ret;
-    case 3:
-        my_memcpy_pic(dmpi->planes[0]+dmpi->stride[0],
-            mpi->planes[0]+mpi->stride[0], 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],
-                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],
-                chroma_width, mpi->chroma_height/2,
-                dmpi->stride[2]*2, mpi->stride[2]*2);
-        }
-        ret = ff_vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE);
-        my_memcpy_pic(dmpi->planes[0], mpi->planes[0], 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],
-                chroma_width, mpi->chroma_height/2,
-                dmpi->stride[1]*2, mpi->stride[1]*2);
-            my_memcpy_pic(dmpi->planes[2], mpi->planes[2],
-                chroma_width, mpi->chroma_height/2,
-                dmpi->stride[2]*2, mpi->stride[2]*2);
-        }
-        return ret;
-    }
-    return 0;
-}
-
-#if 0
-static int query_format(struct vf_instance *vf, unsigned int fmt)
-{
-    /* FIXME - figure out which other formats work */
-    switch (fmt) {
-    case IMGFMT_YV12:
-    case IMGFMT_IYUV:
-    case IMGFMT_I420:
-        return ff_vf_next_query_format(vf, fmt);
-    }
-    return 0;
-}
-
-static int config(struct vf_instance *vf,
-        int width, int height, int d_width, int d_height,
-    unsigned int flags, unsigned int outfmt)
-{
-    return ff_vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
-}
-#endif
-
-static void uninit(struct vf_instance *vf)
-{
-    free(vf->priv);
-}
-
-static int vf_open(vf_instance_t *vf, char *args)
-{
-    //vf->config = config;
-    vf->put_image = put_image;
-    //vf->query_format = query_format;
-    vf->uninit = uninit;
-    vf->default_reqs = VFCAP_ACCEPT_STRIDE;
-    vf->priv = calloc(1, sizeof(struct vf_priv_s));
-    vf->priv->frame = 1;
-    if (args) sscanf(args, "%d", &vf->priv->frame);
-    vf->priv->frame--;
-    return 1;
-}
-
-const vf_info_t ff_vf_info_telecine = {
-    "telecine filter",
-    "telecine",
-    "Rich Felker",
-    "",
-    vf_open,
-    NULL
-};

diff --git a/libavfilter/version.h b/libavfilter/version.h
index 4d55e50ef27395ce0b5b51c724e2b3921b3b946b..e98ea3808be1d3112c7981a7d2de4a2d854791af 100644 (file)
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -30,7 +30,7 @@
 
 #define LIBAVFILTER_VERSION_MAJOR  3
 #define LIBAVFILTER_VERSION_MINOR  52
-#define LIBAVFILTER_VERSION_MICRO 100
+#define LIBAVFILTER_VERSION_MICRO 101
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \

diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c
index 37aaf4e947abd445110355ecd1872c6e57c678bf..b53624fdc93da37bb2ff67fbffe4d259649f5fc2 100644 (file)
--- a/libavfilter/vf_mp.c
+++ b/libavfilter/vf_mp.c
@@ -143,7 +143,6 @@ extern const vf_info_t ff_vf_info_qp;
 extern const vf_info_t ff_vf_info_sab;
 extern const vf_info_t ff_vf_info_softpulldown;
 extern const vf_info_t ff_vf_info_spp;
-extern const vf_info_t ff_vf_info_telecine;
 extern const vf_info_t ff_vf_info_tinterlace;
 extern const vf_info_t ff_vf_info_uspp;
 
@@ -170,7 +169,6 @@ static const vf_info_t* const filters[]={
     &ff_vf_info_sab,
     &ff_vf_info_softpulldown,
     &ff_vf_info_spp,
-    &ff_vf_info_telecine,
     &ff_vf_info_tinterlace,
     &ff_vf_info_uspp,