X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilter.cc;h=5631af55a8885a5d1e6a02cad27d1cb7e85bd9a8;hb=6e3e984162ca7a181bc7c98d90c295e88e4e7f6c;hp=626d35f23e9b1535b2cd2948e79ed3d48812f99e;hpb=677344e05e5c8483d39430ab5058f1ff8114fd9e;p=dcpomatic.git

diff --git a/src/lib/filter.cc b/src/lib/filter.cc
index 626d35f23..5631af55a 100644
--- a/src/lib/filter.cc
+++ b/src/lib/filter.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,22 +18,30 @@
 
 */
 
+
 /** @file src/filter.cc
  *  @brief A class to describe one of FFmpeg's video or audio filters.
  */
 
+
 #include "filter.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 extern "C" {
 #include <libavfilter/avfilter.h>
 }
-#include <boost/foreach.hpp>
+DCPOMATIC_ENABLE_WARNINGS
+#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.
@@ -48,6 +56,7 @@ Filter::Filter (string i, string n, string c, string f)
 
 }
 
+
 /** @return All available filters */
 vector<Filter const *>
 Filter::all ()
@@ -55,6 +64,7 @@ Filter::all ()
 	return _filters;
 }
 
+
 /** Set up the static _filters vector; must be called before from_*
  *  methods are used.
  */
@@ -63,27 +73,39 @@ Filter::setup_filters ()
 {
 	/* Note: "none" is a magic id name, so don't use it here */
 
-	maybe_add (N_("vflip"),     _("Vertical flip"),                    _("Orientation"),     N_("vflip"));
-	maybe_add (N_("hflip"),     _("Horizontal flip"),                  _("Orientation"),     N_("hflip"));
-	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.
  */
@@ -92,7 +114,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_(",");
 		}
@@ -102,19 +124,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;