X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ffilter.h;h=36e4dfa2795ddba7cbe99ea0c4fd99de261d6333;hp=7587312c23dfebf7c2f99167939f3300086270e4;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=92cafb6fc686a041354da2eabde6bcb2f6846e1d

diff --git a/src/lib/filter.h b/src/lib/filter.h
index 7587312c2..36e4dfa27 100644
--- a/src/lib/filter.h
+++ b/src/lib/filter.h
@@ -1,39 +1,45 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 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.h
- *  @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.
  */
 
 #ifndef DCPOMATIC_FILTER_H
 #define DCPOMATIC_FILTER_H
 
+#include <boost/utility.hpp>
 #include <string>
 #include <vector>
 
 /** @class Filter
- *  @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.
+ *
+ *  We don't support FFmpeg's post-processing filters here as they cannot cope with greater than
+ *  8bpp.  FFmpeg quantizes e.g. yuv422p10le down to yuv422p before running such filters, which
+ *  we don't really want to do.
  */
-class Filter
+class Filter : public boost::noncopyable
 {
 public:
-	Filter (std::string, std::string, std::string, std::string, std::string);
+	Filter (std::string, std::string, std::string, std::string);
 
 	/** @return our id */
 	std::string id () const {
@@ -45,24 +51,19 @@ public:
 		return _name;
 	}
 
-	/** @return string for a FFmpeg video filter descriptor */
-	std::string vf () const {
-		return _vf;
-	}
-	
-	/** @return string for a FFmpeg post-processing descriptor */
-	std::string pp () const {
-		return _pp;
+	/** @return string for a FFmpeg filter descriptor */
+	std::string ffmpeg () const {
+		return _ffmpeg;
 	}
 
 	std::string category () const {
 		return _category;
 	}
-	
+
 	static std::vector<Filter const *> all ();
 	static Filter const * from_id (std::string);
 	static void setup_filters ();
-	static std::pair<std::string, std::string> ffmpeg_strings (std::vector<Filter const *> const &);
+	static std::string ffmpeg_string (std::vector<Filter const *> const &);
 
 private:
 
@@ -71,14 +72,12 @@ private:
 	/** user-visible name */
 	std::string _name;
 	std::string _category;
-	/** string for a FFmpeg video filter descriptor */
-	std::string _vf;
-	/** string for a FFmpeg post-processing descriptor */
-	std::string _pp;
+	/** string for a FFmpeg filter descriptor */
+	std::string _ffmpeg;
 
 	/** all available filters */
 	static std::vector<Filter const *> _filters;
-	static void maybe_add (std::string, std::string, std::string, std::string, std::string);
+	static void maybe_add (std::string, std::string, std::string, std::string);
 };
 
 #endif