X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilter.cc;h=663d1454742e63f388af460430f048cf68abd4b0;hb=950ca13738e95f27ce67dbc087db15c68e0c6032;hp=626d35f23e9b1535b2cd2948e79ed3d48812f99e;hpb=677344e05e5c8483d39430ab5058f1ff8114fd9e;p=dcpomatic.git

diff --git a/src/lib/filter.cc b/src/lib/filter.cc
index 626d35f23..663d14547 100644
--- a/src/lib/filter.cc
+++ b/src/lib/filter.cc
@@ -27,6 +27,7 @@ extern "C" {
 #include <libavfilter/avfilter.h>
 }
 #include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -63,23 +64,33 @@ 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())) {
+	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));
 	}
 }