lavfi: remove yuvcsp and yvu9 libmpcodecs wrappers

Same functionality is provided by libswscale.

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

doc/filters.texi

@@ -2611,8 +2611,6 @@ The list of the currently supported filters follows:
 @item tinterlace
 @item unsharp
 @item uspp
-@item yuvcsp
-@item yvu9
 @end table
 
 The parameter syntax and behavior for the listed filters are the same

libavfilter/Makefile

@@ -198,8 +198,6 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_tile.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_tinterlace.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_unsharp.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_uspp.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yuvcsp.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yvu9.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
 
 # multimedia filters

libavfilter/libmpcodecs/vf_yuvcsp.c

@@ -1,120 +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 "img_format.h"
-#include "mp_image.h"
-#include "vf.h"
-
-struct vf_priv_s {
-    int csp;
-};
-
-//===========================================================================//
-
-static int config(struct vf_instance *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 inline int clamp_y(int x){
-    return (x > 235) ? 235 : (x < 16) ? 16 : x;
-}
-
-static inline int clamp_c(int x){
-    return (x > 240) ? 240 : (x < 16) ? 16 : x;
-}
-
-static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
-    int i,j;
-    uint8_t *y_in, *cb_in, *cr_in;
-    uint8_t *y_out, *cb_out, *cr_out;
-
-    vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
-        MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
-        mpi->width, mpi->height);
-
-    y_in = mpi->planes[0];
-    cb_in = mpi->planes[1];
-    cr_in = mpi->planes[2];
-
-    y_out = vf->dmpi->planes[0];
-    cb_out = vf->dmpi->planes[1];
-    cr_out = vf->dmpi->planes[2];
-
-    for (i = 0; i < mpi->height; i++)
-        for (j = 0; j < mpi->width; j++)
-            y_out[i*vf->dmpi->stride[0]+j] = clamp_y(y_in[i*mpi->stride[0]+j]);
-
-    for (i = 0; i < mpi->chroma_height; i++)
-        for (j = 0; j < mpi->chroma_width; j++)
-        {
-            cb_out[i*vf->dmpi->stride[1]+j] = clamp_c(cb_in[i*mpi->stride[1]+j]);
-            cr_out[i*vf->dmpi->stride[2]+j] = clamp_c(cr_in[i*mpi->stride[2]+j]);
-        }
-
-    return vf_next_put_image(vf,vf->dmpi, pts);
-}
-
-//===========================================================================//
-
-/*
-static void uninit(struct vf_instance *vf){
-        free(vf->priv);
-}
-*/
-
-static int query_format(struct vf_instance *vf, unsigned int fmt){
-    switch(fmt){
-        case IMGFMT_YV12:
-        case IMGFMT_I420:
-        case IMGFMT_IYUV:
-            return 1;
-    }
-    return 0;
-}
-
-static int vf_open(vf_instance_t *vf, char *args){
-    vf->config=config;
-    vf->put_image=put_image;
-//    vf->uninit=uninit;
-    vf->query_format=query_format;
-//    vf->priv=calloc(1, sizeof(struct vf_priv_s));
-//    if (args)
-//        vf->priv->csp = atoi(args);
-    return 1;
-}
-
-const vf_info_t vf_info_yuvcsp = {
-    "yuv colorspace converter",
-    "yuvcsp",
-    "Alex Beregszaszi",
-    "",
-    vf_open,
-    NULL
-};
-
-//===========================================================================//

libavfilter/libmpcodecs/vf_yvu9.c

@@ -1,105 +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 "help_mp.h"
-
-#include "img_format.h"
-#include "mp_image.h"
-#include "vf.h"
-
-#include "libvo/fastmemcpy.h"
-
-//===========================================================================//
-
-static int config(struct vf_instance *vf,
-        int width, int height, int d_width, int d_height,
-        unsigned int flags, unsigned int outfmt){
-
-    if(vf_next_query_format(vf,IMGFMT_YV12)<=0){
-        mp_msg(MSGT_VFILTER, MSGL_WARN, MSGTR_MPCODECS_WarnNextFilterDoesntSupport, "YVU9");
-        return 0;
-    }
-
-    return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_YV12);
-}
-
-static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
-    mp_image_t *dmpi;
-    int y,w,h;
-
-    // hope we'll get DR buffer:
-    dmpi=vf_get_image(vf->next,IMGFMT_YV12,
-        MP_IMGTYPE_TEMP, 0/*MP_IMGFLAG_ACCEPT_STRIDE*/,
-        mpi->w, mpi->h);
-
-    for(y=0;y<mpi->h;y++)
-        fast_memcpy(dmpi->planes[0]+dmpi->stride[0]*y,
-               mpi->planes[0]+mpi->stride[0]*y,
-               mpi->w);
-
-    w=mpi->w/4; h=mpi->h/2;
-    for(y=0;y<h;y++){
-        unsigned char* s=mpi->planes[1]+mpi->stride[1]*(y>>1);
-        unsigned char* d=dmpi->planes[1]+dmpi->stride[1]*y;
-        int x;
-        for(x=0;x<w;x++) d[2*x]=d[2*x+1]=s[x];
-    }
-    for(y=0;y<h;y++){
-        unsigned char* s=mpi->planes[2]+mpi->stride[2]*(y>>1);
-        unsigned char* d=dmpi->planes[2]+dmpi->stride[2]*y;
-        int x;
-        for(x=0;x<w;x++) d[2*x]=d[2*x+1]=s[x];
-    }
-
-    vf_clone_mpi_attributes(dmpi, mpi);
-
-    return vf_next_put_image(vf,dmpi, pts);
-}
-
-//===========================================================================//
-
-static int query_format(struct vf_instance *vf, unsigned int fmt){
-    if (fmt == IMGFMT_YVU9 || fmt == IMGFMT_IF09)
-        return vf_next_query_format(vf,IMGFMT_YV12) & (~VFCAP_CSP_SUPPORTED_BY_HW);
-    return 0;
-}
-
-static int vf_open(vf_instance_t *vf, char *args){
-    vf->config=config;
-    vf->put_image=put_image;
-    vf->query_format=query_format;
-    return 1;
-}
-
-const vf_info_t vf_info_yvu9 = {
-    "fast YVU9->YV12 conversion",
-    "yvu9",
-    "alex",
-    "",
-    vf_open,
-    NULL
-};
-
-//===========================================================================//

libavfilter/version.h

@@ -30,7 +30,7 @@
 
 #define LIBAVFILTER_VERSION_MAJOR  3
 #define LIBAVFILTER_VERSION_MINOR  20
-#define LIBAVFILTER_VERSION_MICRO 111
+#define LIBAVFILTER_VERSION_MICRO 112
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \

libavfilter/vf_mp.c

@@ -180,8 +180,6 @@ extern const vf_info_t vf_info_unsharp;
 extern const vf_info_t vf_info_uspp;
 extern const vf_info_t vf_info_vo;
 extern const vf_info_t vf_info_yadif;
-extern const vf_info_t vf_info_yuvcsp;
-extern const vf_info_t vf_info_yvu9;
 extern const vf_info_t vf_info_zrmjpeg;
 
 
@@ -226,8 +224,6 @@ static const vf_info_t* const filters[]={
     &vf_info_tinterlace,
     &vf_info_unsharp,
     &vf_info_uspp,
-    &vf_info_yuvcsp,
-    &vf_info_yvu9,
 
     NULL
 };