From 702090869122a42622623a94d0d43e9cf10d91db Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 11 Sep 2015 23:47:00 +0200 Subject: video/filter: remove some vf_lavfi wrappers I see no point in keeping these around. Keeping wrappers for some select libavfilter filters just because MPlayer had these filters is not a good reason. Ultimately, all real filtering work should go to libavfilter, and users should get used to using vf_lavfi directly. We might even not require the awful double-nested syntax for using libavfilter one day. vf_rotate, vf_yadif, vf_stereo3d are kept because mpv uses them internally. (They all extend the lavfi filters or change their defaults.) vf_mirror is kept for symmetry with vf_flip. vf_gradfun and vf_pullup are probably semi-popular, so I'll remove them not yet - only after some more discussion. --- video/filter/vf_delogo.c | 76 ------------------------------------------------ 1 file changed, 76 deletions(-) delete mode 100644 video/filter/vf_delogo.c (limited to 'video/filter/vf_delogo.c') diff --git a/video/filter/vf_delogo.c b/video/filter/vf_delogo.c deleted file mode 100644 index 899a972764..0000000000 --- a/video/filter/vf_delogo.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (C) 2002 Jindrich Makovicka - * - * This file is part of mpv. - * - * mpv 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. - * - * mpv 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 mpv. If not, see . - */ - -#include - -#include "common/msg.h" -#include "vf.h" -#include "vf_lavfi.h" - -#include "options/m_option.h" - -static struct vf_priv_s { - int xoff, yoff, lw, lh, band, show; - struct vf_lw_opts *lw_opts; -} const vf_priv_dflt = { - .band = 1, -}; - -static int vf_open(vf_instance_t *vf){ - struct vf_priv_s *p = vf->priv; - - int band = p->band; - int show = p->show; - if (band < 0) { - band = 4; - show = 1; - } - if (vf_lw_set_graph(vf, p->lw_opts, "delogo", "%d:%d:%d:%d:%d:%d", - p->xoff, p->yoff, p->lw, p->lh, band, show) >= 0) - { - return 1; - } - - MP_FATAL(vf, "This version of libavfilter has no 'delogo' filter.\n"); - return 0; -} - -#define OPT_BASE_STRUCT struct vf_priv_s -static const m_option_t vf_opts_fields[] = { - OPT_INT("x", xoff, 0), - OPT_INT("y", yoff, 0), - OPT_INT("w", lw, 0), - OPT_INT("h", lh, 0), - OPT_INT("t", band, 0), - OPT_INT("band", band, 0), // alias - OPT_FLAG("show", show, 0), - OPT_SUBSTRUCT("", lw_opts, vf_lw_conf, 0), - {0} -}; - -const vf_info_t vf_info_delogo = { - .description = "simple logo remover", - .name = "delogo", - .open = vf_open, - .priv_size = sizeof(struct vf_priv_s), - .priv_defaults = &vf_priv_dflt, - .options = vf_opts_fields, -}; - -//===========================================================================// -- cgit v1.2.3