X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilter.cc;h=7db329b00fca5c46b13c867ae17caf3337ccea59;hb=83a948956916abb7b2c13c25141323d326b38708;hp=c9876c05b16d150748a3fb0cdd17e6d5b2c9d5e9;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git diff --git a/src/lib/filter.cc b/src/lib/filter.cc index c9876c05b..7db329b00 100644 --- a/src/lib/filter.cc +++ b/src/lib/filter.cc @@ -1,53 +1,66 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic 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. - This program is distributed in the hope that it will be useful, + DCP-o-matic 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 this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ + /** @file src/filter.cc - * @brief A class to describe one of FFmpeg's video or post-processing filters. + * @brief A class to describe one of FFmpeg's video or audio filters. */ + +#include "dcpomatic_assert.h" #include "filter.h" +#include +LIBDCP_DISABLE_WARNINGS extern "C" { #include } +LIBDCP_ENABLE_WARNINGS +#include #include "i18n.h" + using namespace std; +using boost::optional; + + +vector Filter::_filters; -vector Filter::_filters; /** @param i Our id. * @param n User-visible name. * @param c User-visible category. - * @param v String for a FFmpeg video filter descriptor. + * @param f String for a FFmpeg filter descriptor. */ -Filter::Filter (string i, string n, string c, string v) +Filter::Filter (string i, string n, string c, string f) : _id (i) , _name (n) , _category (c) - , _vf (v) + , _ffmpeg (f) { } + /** @return All available filters */ -vector +vector Filter::all () { return _filters; @@ -62,58 +75,100 @@ Filter::setup_filters () { /* Note: "none" is a magic id name, so don't use it here */ - maybe_add (N_("mcdeint"), _("Motion compensating deinterlacer"), _("De-interlacing"), N_("mcdeint")); - maybe_add (N_("kerndeint"), _("Kernel deinterlacer"), _("De-interlacing"), N_("kerndeint")); - maybe_add (N_("yadif"), _("Yet Another Deinterlacing Filter"), _("De-interlacing"), N_("yadif")); - maybe_add (N_("gradfun"), _("Gradient debander"), _("Misc"), N_("gradfun")); - maybe_add (N_("unsharp"), _("Unsharp mask and Gaussian blur"), _("Misc"), N_("unsharp")); - maybe_add (N_("denoise3d"), _("3D denoiser"), _("Noise reduction"), N_("denoise3d")); - maybe_add (N_("hqdn3d"), _("High quality 3D denoiser"), _("Noise reduction"), N_("hqdn3d")); - maybe_add (N_("telecine"), _("Telecine filter"), _("Misc"), N_("telecine")); - maybe_add (N_("ow"), _("Overcomplete wavelet denoiser"), _("Noise reduction"), N_("mp=ow")); + maybe_add (N_("vflip"), _("Vertical flip"), _("Orientation"), N_("vflip")); + maybe_add (N_("hflip"), _("Horizontal flip"), _("Orientation"), N_("hflip")); + maybe_add (N_("90clock"), _("Rotate 90 degrees clockwise"), _("Orientation"), N_("transpose=dir=clock")); + maybe_add (N_("90anticlock"), _("Rotate 90 degrees anti-clockwise"), _("Orientation"), N_("transpose=dir=cclock")); + maybe_add (N_("mcdeint"), _("Motion compensating deinterlacer"), _("De-interlacing"), N_("mcdeint")); + maybe_add (N_("kerndeint"), _("Kernel deinterlacer"), _("De-interlacing"), N_("kerndeint")); + maybe_add (N_("yadif"), _("Yet Another Deinterlacing Filter"), _("De-interlacing"), N_("yadif")); + maybe_add (N_("bwdif"), _("Bob Weaver Deinterlacing Filter"), _("De-interlacing"), N_("bwdif")); + maybe_add (N_("weave"), _("Weave filter"), _("De-interlacing"), N_("weave")); + maybe_add (N_("gradfun"), _("Gradient debander"), _("Misc"), N_("gradfun")); + maybe_add (N_("unsharp"), _("Unsharp mask and Gaussian blur"), _("Misc"), N_("unsharp")); + maybe_add (N_("denoise3d"), _("3D denoiser"), _("Noise reduction"), N_("denoise3d")); + maybe_add (N_("hqdn3d"), _("High quality 3D denoiser"), _("Noise reduction"), N_("hqdn3d")); + maybe_add (N_("telecine"), _("Telecine filter"), _("Misc"), N_("telecine")); + maybe_add (N_("ow"), _("Overcomplete wavelet denoiser"), _("Noise reduction"), N_("mp=ow")); } + void -Filter::maybe_add (string i, string n, string c, string v) +Filter::maybe_add (string i, string n, string c, string f) { - if (avfilter_get_by_name (i.c_str())) { - _filters.push_back (new Filter (i, n, c, v)); + string check_name = f; + size_t end = check_name.find("="); + if (end != string::npos) { + check_name = check_name.substr (0, end); + } + + if (avfilter_get_by_name(check_name.c_str())) { + _filters.push_back (Filter(i, n, c, f)); } } + /** @param filters Set of filters. * @return String to pass to FFmpeg for the video filters. */ string -Filter::ffmpeg_string (vector const & filters) +Filter::ffmpeg_string(vector const& filters) { - string vf; + string ff; - for (vector::const_iterator i = filters.begin(); i != filters.end(); ++i) { - if (!vf.empty ()) { - vf += N_(","); + for (auto const& i: filters) { + if (!ff.empty ()) { + ff += N_(","); } - vf += (*i)->vf (); + ff += i.ffmpeg(); } - return vf; + return ff; } + /** @param d Our id. - * @return Corresponding Filter, or 0. + * @return Corresponding Filter, if found. */ -Filter const * -Filter::from_id (string d) +optional +Filter::from_id(string id) { - vector::iterator i = _filters.begin (); - while (i != _filters.end() && (*i)->id() != d) { - ++i; + auto iter = std::find_if(_filters.begin(), _filters.end(), [id](Filter const& filter) { return filter.id() == id; }); + if (iter == _filters.end()) { + return {}; } + return *iter; +} - if (i == _filters.end ()) { - return 0; - } - return *i; +bool +operator==(Filter const& a, Filter const& b) +{ + return a.id() == b.id() && a.name() == b.name() && a.category() == b.category() && a.ffmpeg() == b.ffmpeg(); } + +bool +operator!=(Filter const& a, Filter const& b) +{ + return a.id() != b.id() || a.name() != b.name() || a.category() != b.category() || a.ffmpeg() != b.ffmpeg(); +} + + +bool +operator<(Filter const& a, Filter const& b) +{ + if (a.id() != b.id()) { + return a.id() < b.id(); + } + + if (a.name() != b.name()) { + return a.name() < b.name(); + } + + if (a.category() != b.category()) { + return a.category() < b.category(); + } + + return a.ffmpeg() < b.ffmpeg(); +}