X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilter.cc;h=c9876c05b16d150748a3fb0cdd17e6d5b2c9d5e9;hb=276a8f49c94cc80a7b29d5ecd8c7584e7ddcd87c;hp=c2388272646307aac9e51e416f0cb1fabd0e15c2;hpb=98bbaf1e907e927dbd26131cbdef243a82fdc2d1;p=dcpomatic.git

diff --git a/src/lib/filter.cc b/src/lib/filter.cc
index c23882726..c9876c05b 100644
--- a/src/lib/filter.cc
+++ b/src/lib/filter.cc
@@ -24,23 +24,24 @@
 #include "filter.h"
 extern "C" {
 #include <libavfilter/avfilter.h>
-#include <libpostproc/postprocess.h>
 }
 
+#include "i18n.h"
+
 using namespace std;
 
 vector<Filter const *> Filter::_filters;
 
 /** @param i Our id.
  *  @param n User-visible name.
- *  @param v String for a FFmpeg video filter descriptor, or "".
- *  @param p String for a FFmpeg post-processing descriptor, or "".
+ *  @param c User-visible category.
+ *  @param v String for a FFmpeg video filter descriptor.
  */
-Filter::Filter (string i, string n, string v, string p)
+Filter::Filter (string i, string n, string c, string v)
 	: _id (i)
 	, _name (n)
+	, _category (c)
 	, _vf (v)
-	, _pp (p)
 {
 
 }
@@ -60,76 +61,42 @@ void
 Filter::setup_filters ()
 {
 	/* Note: "none" is a magic id name, so don't use it here */
-	   
-	maybe_add ("pphb", "Horizontal deblocking filter", "", "hb");
-	maybe_add ("ppvb", "Vertical deblocking filter", "", "vb");
-	maybe_add ("ppha", "Horizontal deblocking filter A", "", "ha");
-	maybe_add ("ppva", "Vertical deblocking filter A", "", "va");
-	maybe_add ("pph1", "Experimental horizontal deblocking filter 1", "", "h1");
-	maybe_add ("pphv", "Experimental vertical deblocking filter 1", "", "v1");
-	maybe_add ("ppdr", "Deringing filter", "", "dr");
-	maybe_add ("pplb", "Linear blend deinterlacer", "", "lb");
-	maybe_add ("ppli", "Linear interpolating deinterlacer", "", "li");
-	maybe_add ("ppci", "Cubic interpolating deinterlacer", "", "ci");
-	maybe_add ("ppmd", "Median deinterlacer", "", "md");
-	maybe_add ("ppfd", "FFMPEG deinterlacer", "", "fd");
-	maybe_add ("ppl5", "FIR low-pass deinterlacer", "", "l5");
-	maybe_add ("mcdeint", "Motion compensating deinterlacer", "mcdeint", "");
-	maybe_add ("kerndeint", "Kernel deinterlacer", "kerndeint", "");
-	maybe_add ("yadif", "Yet Another Deinterlacing Filter", "yadif", "");
-	maybe_add ("pptn", "Temporal noise reducer", "", "tn");
-	maybe_add ("ppfq", "Force quantizer", "", "fq");
-	maybe_add ("gradfun", "Gradient debander", "gradfun", "");
-	maybe_add ("unsharp", "Unsharp mask and Gaussian blur", "unsharp", "");
-	maybe_add ("denoise3d", "3D denoiser", "denoise3d", "");
-	maybe_add ("hqdn3d", "High quality 3D denoiser", "hqdn3d", "");
-	maybe_add ("telecine", "Telecine filter", "telecine", "");
-	maybe_add ("ow", "Overcomplete wavelet denoiser", "mp=ow", "");
+
+	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"));
 }
 
 void
-Filter::maybe_add (string i, string n, string v, string p)
+Filter::maybe_add (string i, string n, string c, string v)
 {
-	if (!v.empty ()) {
-		if (avfilter_get_by_name (i.c_str())) {
-			_filters.push_back (new Filter (i, n, v, p));
-		}
-	} else if (!p.empty ()) {
-		pp_mode* m = pp_get_mode_by_name_and_quality (p.c_str(), PP_QUALITY_MAX);
-		if (m) {
-			_filters.push_back (new Filter (i, n, v, p));
-			pp_free_mode (m);
-		}
+	if (avfilter_get_by_name (i.c_str())) {
+		_filters.push_back (new Filter (i, n, c, v));
 	}
 }
 
 /** @param filters Set of filters.
- *  @return A pair; .first is a string to pass to FFmpeg for the video filters,
- *  .second is a string to pass for the post-processors.
+ *  @return String to pass to FFmpeg for the video filters.
  */
-pair<string, string>
-Filter::ffmpeg_strings (vector<Filter const *> const & filters)
+string
+Filter::ffmpeg_string (vector<Filter const *> const & filters)
 {
 	string vf;
-	string pp;
 
 	for (vector<Filter const *>::const_iterator i = filters.begin(); i != filters.end(); ++i) {
-		if (!(*i)->vf().empty ()) {
-			if (!vf.empty ()) {
-				vf += ",";
-			}
-			vf += (*i)->vf ();
-		}
-		
-		if (!(*i)->pp().empty ()) {
-			if (!pp.empty()) {
-				pp += ",";
-			}
-			pp += (*i)->pp ();
+		if (!vf.empty ()) {
+			vf += N_(",");
 		}
+		vf += (*i)->vf ();
 	}
 
-	return make_pair (vf, pp);
+	return vf;
 }
 
 /** @param d Our id.