X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilter_graph.h;h=5b43c5512fb9fa127bf5c364e292a22d9a7e1ce0;hb=e5f79c57e1123754b1325f964123fcb56a2572b3;hp=1ff5527ab827c868a8056ccb4e69226f64079681;hpb=a84e33159d708362b10ff61af186a59cc9f5be6b;p=dcpomatic.git

diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h
index 1ff5527ab..5b43c5512 100644
--- a/src/lib/filter_graph.h
+++ b/src/lib/filter_graph.h
@@ -25,28 +25,31 @@
 #define DCPOMATIC_FILTER_GRAPH_H
 
 #include "util.h"
-#include "ffmpeg_compatibility.h"
 
 class Image;
 class VideoFilter;
-class FFmpegDecoder;
+class FFmpegContent;
 
 /** @class FilterGraph
  *  @brief A graph of FFmpeg filters.
  */
-class FilterGraph
+class FilterGraph : public boost::noncopyable
 {
 public:
-	FilterGraph (boost::shared_ptr<const Film>, FFmpegDecoder* decoder, libdcp::Size s, AVPixelFormat p);
+	FilterGraph (boost::shared_ptr<const FFmpegContent> content, dcp::Size s, AVPixelFormat p);
+	~FilterGraph ();
 
-	bool can_process (libdcp::Size s, AVPixelFormat p) const;
-	std::list<boost::shared_ptr<Image> > process (AVFrame const * frame);
+	bool can_process (dcp::Size s, AVPixelFormat p) const;
+	std::list<std::pair<boost::shared_ptr<Image>, int64_t> > process (AVFrame * frame);
 
 private:
+	/** true if this graph has no filters in, so it just copies stuff straight through */
+	bool _copy;
 	AVFilterContext* _buffer_src_context;
 	AVFilterContext* _buffer_sink_context;
-	libdcp::Size _size; ///< size of the images that this chain can process
+	dcp::Size _size; ///< size of the images that this chain can process
 	AVPixelFormat _pixel_format; ///< pixel format of the images that this chain can process
+	AVFrame* _frame;
 };
 
 #endif