C++11 tidying.

[dcpomatic.git] / src / lib / filter.cc

diff --git a/src/lib/filter.cc b/src/lib/filter.cc
index d0e8c8fa4e3e825db89604c32489cb00718e76cb..1c1039065227c4c5c3fdbc27abf8ded1a331b8c8 100644 (file)
--- a/src/lib/filter.cc
+++ b/src/lib/filter.cc
@@ -1,38 +1,44 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
+
 /** @file src/filter.cc
  *  @brief A class to describe one of FFmpeg's video or audio filters.
  */
 
+
 #include "filter.h"
 extern "C" {
 #include <libavfilter/avfilter.h>
 }
-#include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
+
 using namespace std;
 
+
 vector<Filter const *> Filter::_filters;
 
+
 /** @param i Our id.
  *  @param n User-visible name.
  *  @param c User-visible category.
@@ -47,6 +53,7 @@ Filter::Filter (string i, string n, string c, string f)
 
 }
 
+
 /** @return All available filters */
 vector<Filter const *>
 Filter::all ()
@@ -54,6 +61,7 @@ Filter::all ()
        return _filters;
 }
 
+
 /** Set up the static _filters vector; must be called before from_*
  *  methods are used.
  */
@@ -62,25 +70,39 @@ 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 f)
 {
-       if (avfilter_get_by_name (i.c_str())) {
-               _filters.push_back (new Filter (i, n, c, f));
+       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 (new Filter(i, n, c, f));
        }
 }
 
+
 /** @param filters Set of filters.
  *  @return String to pass to FFmpeg for the video filters.
  */
@@ -89,7 +111,7 @@ Filter::ffmpeg_string (vector<Filter const *> const & filters)
 {
        string ff;
 
-       BOOST_FOREACH (Filter const * i, filters) {
+       for (auto const i: filters) {
                if (!ff.empty ()) {
                        ff += N_(",");
                }
@@ -99,19 +121,20 @@ Filter::ffmpeg_string (vector<Filter const *> const & filters)
        return ff;
 }
 
+
 /** @param d Our id.
  *  @return Corresponding Filter, or 0.
  */
 Filter const *
 Filter::from_id (string d)
 {
-       vector<Filter const *>::iterator i = _filters.begin ();
+       auto i = _filters.begin ();
        while (i != _filters.end() && (*i)->id() != d) {
                ++i;
        }
 
        if (i == _filters.end ()) {
-               return 0;
+               return nullptr;
        }
 
        return *i;