From 82e3d06f093188afdec1e549aed721b066521b6c Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 27 Jan 2015 19:02:16 +0100 Subject: vf_swapuv: remove this filter It's entirely useless. I left it in for a while, because the analog TV code had a transitional bug that could switch chroma planes, but it was fixed long ago. It's also available in libavfilter. --- DOCS/man/vf.rst | 3 --- old-makefile | 1 - video/filter/vf.c | 2 -- video/filter/vf_swapuv.c | 64 ------------------------------------------------ wscript_build.py | 1 - 5 files changed, 71 deletions(-) delete mode 100644 video/filter/vf_swapuv.c diff --git a/DOCS/man/vf.rst b/DOCS/man/vf.rst index 5690b28ccb..4e7302bbee 100644 --- a/DOCS/man/vf.rst +++ b/DOCS/man/vf.rst @@ -375,9 +375,6 @@ Available filters are: :<0: blur :>0: sharpen -``swapuv`` - Swap U & V plane. - ``pullup[=jl:jr:jt:jb:sb:mp]`` Pulldown reversal (inverse telecine) filter, capable of handling mixed hard-telecine, 24000/1001 fps progressive, and 30000/1001 fps progressive diff --git a/old-makefile b/old-makefile index f1defc8673..2286588381 100644 --- a/old-makefile +++ b/old-makefile @@ -270,7 +270,6 @@ SOURCES = audio/audio.c \ video/filter/vf_screenshot.c \ video/filter/vf_stereo3d.c \ video/filter/vf_sub.c \ - video/filter/vf_swapuv.c \ video/filter/vf_unsharp.c \ video/filter/vf_yadif.c \ video/out/bitmap_packer.c \ diff --git a/video/filter/vf.c b/video/filter/vf.c index f51b7824ad..251616c0c2 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -53,7 +53,6 @@ extern const vf_info_t vf_info_noise; extern const vf_info_t vf_info_eq; extern const vf_info_t vf_info_gradfun; extern const vf_info_t vf_info_unsharp; -extern const vf_info_t vf_info_swapuv; extern const vf_info_t vf_info_hqdn3d; extern const vf_info_t vf_info_ilpack; extern const vf_info_t vf_info_dsize; @@ -94,7 +93,6 @@ static const vf_info_t *const filter_list[] = { &vf_info_eq, &vf_info_gradfun, &vf_info_unsharp, - &vf_info_swapuv, &vf_info_hqdn3d, &vf_info_ilpack, &vf_info_dsize, diff --git a/video/filter/vf_swapuv.c b/video/filter/vf_swapuv.c deleted file mode 100644 index eabc5f1ed3..0000000000 --- a/video/filter/vf_swapuv.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2002 Michael Niedermayer - * - * 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 -#include - -#include "common/msg.h" -#include "video/img_format.h" -#include "video/mp_image.h" -#include "vf.h" - -static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi) -{ - struct mp_image old = *mpi; - mpi->planes[1] = old.planes[2]; - mpi->stride[1] = old.stride[2]; - mpi->planes[2] = old.planes[1]; - mpi->stride[2] = old.stride[1]; - return mpi; -} - -static int query_format(struct vf_instance *vf, unsigned int fmt) -{ - struct mp_imgfmt_desc desc = mp_imgfmt_get_desc(fmt); - if (!(desc.flags & MP_IMGFLAG_BYTE_ALIGNED)) - return 0; - if (!(desc.num_planes >= 3 && desc.bytes[1] == desc.bytes[2])) - return 0; - return vf_next_query_format(vf, fmt); -} - -static int vf_open(vf_instance_t *vf){ - vf->filter=filter; - vf->query_format=query_format; - return 1; -} - -const vf_info_t vf_info_swapuv = { - .description = "UV swapper", - .name = "swapuv", - .open = vf_open, -}; - -//===========================================================================// diff --git a/wscript_build.py b/wscript_build.py index b89834d7f4..830ec95227 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -319,7 +319,6 @@ def build(ctx): ( "video/filter/vf_screenshot.c" ), ( "video/filter/vf_stereo3d.c" ), ( "video/filter/vf_sub.c" ), - ( "video/filter/vf_swapuv.c" ), ( "video/filter/vf_unsharp.c" ), ( "video/filter/vf_vapoursynth.c", "vapoursynth-core" ), ( "video/filter/vf_vavpp.c", "vaapi-vpp"), -- cgit v1.2.3