lavfi: remove mp=down3dright

Same funcionality is provided by stereo3d=ab[2]{l,r}:sbs[2]{l,r}.
Additional "features" are barely useful and cause crash or artifacts.

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

doc/filters.texi

@@ -4440,7 +4440,6 @@ the named filter.
 The list of the currently supported filters follows:
 @table @var
 @item dint
-@item down3dright
 @item eq2
 @item eq
 @item fil

libavfilter/Makefile

@@ -198,7 +198,6 @@ OBJS-$(CONFIG_NULLSINK_FILTER)               += vsink_nullsink.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/mp_image.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/img_format.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_dint.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_down3dright.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_eq2.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_eq.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fil.o

libavfilter/libmpcodecs/vf_down3dright.c

@@ -1,166 +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 <inttypes.h>
-
-#include "config.h"
-#include "mp_msg.h"
-#include "cpudetect.h"
-
-#include "img_format.h"
-#include "mp_image.h"
-#include "vf.h"
-
-#include "libvo/fastmemcpy.h"
-
-struct vf_priv_s {
-        int skipline;
-        int scalew;
-        int scaleh;
-};
-
-static void toright(unsigned char *dst[3], unsigned char *src[3],
-                    int dststride[3], int srcstride[3],
-                    int w, int h, struct vf_priv_s* p)
-{
-        int k;
-
-        for (k = 0; k < 3; k++) {
-                unsigned char* fromL = src[k];
-                unsigned char* fromR = src[k];
-                unsigned char* to = dst[k];
-                int src = srcstride[k];
-                int dst = dststride[k];
-                int ss;
-                unsigned int dd;
-                int i;
-
-                if (k > 0) {
-                        i = h / 4 - p->skipline / 2;
-                        ss = src * (h / 4 + p->skipline / 2);
-                        dd = w / 4;
-                } else {
-                        i = h / 2 - p->skipline;
-                        ss = src * (h / 2 + p->skipline);
-                        dd = w / 2;
-                }
-                fromR += ss;
-                for ( ; i > 0; i--) {
-                        int j;
-                        unsigned char* t = to;
-                        unsigned char* sL = fromL;
-                        unsigned char* sR = fromR;
-
-                        if (p->scalew == 1) {
-                                for (j = dd; j > 0; j--) {
-                                        *t++ = (sL[0] + sL[1]) / 2;
-                                        sL+=2;
-                                }
-                                for (j = dd ; j > 0; j--) {
-                                        *t++ = (sR[0] + sR[1]) / 2;
-                                        sR+=2;
-                                }
-                        } else {
-                                for (j = dd * 2 ; j > 0; j--)
-                                        *t++ = *sL++;
-                                for (j = dd * 2 ; j > 0; j--)
-                                        *t++ = *sR++;
-                        }
-                        if (p->scaleh == 1) {
-                                fast_memcpy(to + dst, to, dst);
-                                to += dst;
-                        }
-                        to += dst;
-                        fromL += src;
-                        fromR += src;
-                }
-                //printf("K %d  %d   %d   %d  %d \n", k, w, h,  src, dst);
-        }
-}
-
-static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
-{
-        mp_image_t *dmpi;
-
-        // hope we'll get DR buffer:
-        dmpi=ff_vf_get_image(vf->next, IMGFMT_YV12,
-                          MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE |
-                          ((vf->priv->scaleh == 1) ? MP_IMGFLAG_READABLE : 0),
-                          mpi->w * vf->priv->scalew,
-                          mpi->h / vf->priv->scaleh - vf->priv->skipline);
-
-        toright(dmpi->planes, mpi->planes, dmpi->stride,
-                mpi->stride, mpi->w, mpi->h, vf->priv);
-
-        return ff_vf_next_put_image(vf,dmpi, pts);
-}
-
-static int config(struct vf_instance *vf,
-                  int width, int height, int d_width, int d_height,
-                  unsigned int flags, unsigned int outfmt)
-{
-        /* FIXME - also support UYVY output? */
-        return ff_vf_next_config(vf, width * vf->priv->scalew,
-                              height / vf->priv->scaleh - vf->priv->skipline, d_width, d_height, flags, IMGFMT_YV12);
-}
-
-
-static int query_format(struct vf_instance *vf, unsigned int fmt)
-{
-        /* FIXME - really any YUV 4:2:0 input format should work */
-        switch (fmt) {
-        case IMGFMT_YV12:
-        case IMGFMT_IYUV:
-        case IMGFMT_I420:
-                return ff_vf_next_query_format(vf, IMGFMT_YV12);
-        }
-        return 0;
-}
-
-static void uninit(struct vf_instance *vf)
-{
-        free(vf->priv);
-}
-
-static int vf_open(vf_instance_t *vf, char *args)
-{
-        vf->config=config;
-        vf->query_format=query_format;
-        vf->put_image=put_image;
-        vf->uninit=uninit;
-
-        vf->priv = calloc(1, sizeof (struct vf_priv_s));
-        vf->priv->skipline = 0;
-        vf->priv->scalew = 1;
-        vf->priv->scaleh = 2;
-        if (args) sscanf(args, "%d:%d:%d", &vf->priv->skipline, &vf->priv->scalew, &vf->priv->scaleh);
-
-        return 1;
-}
-
-const vf_info_t ff_vf_info_down3dright = {
-        "convert stereo movie from top-bottom to left-right field",
-        "down3dright",
-        "Zdenek Kabelac",
-        "",
-        vf_open,
-        NULL
-};

libavfilter/version.h

@@ -30,7 +30,7 @@
 
 #define LIBAVFILTER_VERSION_MAJOR  3
 #define LIBAVFILTER_VERSION_MINOR  60
-#define LIBAVFILTER_VERSION_MICRO 100
+#define LIBAVFILTER_VERSION_MICRO 101
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \

libavfilter/vf_mp.c

@@ -124,7 +124,6 @@ static const struct {
 };
 
 extern const vf_info_t ff_vf_info_dint;
-extern const vf_info_t ff_vf_info_down3dright;
 extern const vf_info_t ff_vf_info_eq2;
 extern const vf_info_t ff_vf_info_eq;
 extern const vf_info_t ff_vf_info_fil;
@@ -146,7 +145,6 @@ extern const vf_info_t ff_vf_info_uspp;
 
 static const vf_info_t* const filters[]={
     &ff_vf_info_dint,
-    &ff_vf_info_down3dright,
     &ff_vf_info_eq2,
     &ff_vf_info_eq,
     &ff_vf_info_fil,