From 652fab5996a3e283df69ed51132745ba45086251 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Wed, 31 Oct 2012 12:10:07 +0100 Subject: [PATCH] lavfi/mp: drop wrapped field filter The filter has been ported to a native libavfilter filter. --- doc/filters.texi | 1 - libavfilter/Makefile | 1 - libavfilter/libmpcodecs/vf_field.c | 89 ------------------------------ libavfilter/version.h | 2 +- libavfilter/vf_mp.c | 2 - 5 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 libavfilter/libmpcodecs/vf_field.c diff --git a/doc/filters.texi b/doc/filters.texi index 7bf3896282..2abf60c2cd 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2623,7 +2623,6 @@ The list of the currently supported filters follows: @item dsize @item eq2 @item eq -@item field @item fil @item fixpts @item fspp diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 7fa4d88259..47015ee231 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -167,7 +167,6 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_down3dright.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_dsize.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_eq2.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_eq.o -OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_field.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fil.o #OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_filmdint.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fixpts.o diff --git a/libavfilter/libmpcodecs/vf_field.c b/libavfilter/libmpcodecs/vf_field.c deleted file mode 100644 index fcf24be0bc..0000000000 --- a/libavfilter/libmpcodecs/vf_field.c +++ /dev/null @@ -1,89 +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 -#include -#include - -#include "config.h" -#include "mp_msg.h" - -#include "mp_image.h" -#include "vf.h" - -struct vf_priv_s { - int field; -}; - -//===========================================================================// - -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/2,d_width,d_height,flags,outfmt); -} - -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ - vf->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->dmpi->planes[0]=mpi->planes[0]+mpi->stride[0]*vf->priv->field; - vf->dmpi->stride[0]=2*mpi->stride[0]; - if(vf->dmpi->flags&MP_IMGFLAG_PLANAR){ - vf->dmpi->planes[1]=mpi->planes[1]+ - mpi->stride[1]*vf->priv->field; - vf->dmpi->stride[1]=2*mpi->stride[1]; - vf->dmpi->planes[2]=mpi->planes[2]+ - mpi->stride[2]*vf->priv->field; - vf->dmpi->stride[2]=2*mpi->stride[2]; - } else - vf->dmpi->planes[1]=mpi->planes[1]; // passthru bgr8 palette!!! - - return vf_next_put_image(vf,vf->dmpi, pts); -} - -//===========================================================================// - -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->uninit=uninit; - 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; -} - -const vf_info_t vf_info_field = { - "extract single field", - "field", - "Rich Felker", - "", - vf_open, - NULL -}; - -//===========================================================================// diff --git a/libavfilter/version.h b/libavfilter/version.h index 4168f44acd..0bfae301ee 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MINOR 21 -#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 01c73f8b18..146041b7dd 100644 --- a/libavfilter/vf_mp.c +++ b/libavfilter/vf_mp.c @@ -137,7 +137,6 @@ extern const vf_info_t vf_info_dvbscale; extern const vf_info_t vf_info_eq2; extern const vf_info_t vf_info_eq; extern const vf_info_t vf_info_expand; -extern const vf_info_t vf_info_field; extern const vf_info_t vf_info_fil; extern const vf_info_t vf_info_filmdint; extern const vf_info_t vf_info_fixpts; @@ -192,7 +191,6 @@ static const vf_info_t* const filters[]={ &vf_info_dsize, &vf_info_eq2, &vf_info_eq, - &vf_info_field, &vf_info_fil, // &vf_info_filmdint, cmmx.h vd.h ‘opt_screen_size_x’ &vf_info_fixpts,