X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilter_graph.cc;h=d2427c31faf35957b251320d1d091fce2e54b161;hb=391d85619ac19a2a93696ddc35c222eb9bb5d9d6;hp=472480de300dee5834555ddde7aba22f5fb369a2;hpb=883d885dc8690519d205c8baa275385af8a39f4b;p=dcpomatic.git

diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index 472480de3..d2427c31f 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -33,42 +33,41 @@ extern "C" {
 #include "filter.h"
 #include "exceptions.h"
 #include "image.h"
-#include "ffmpeg_decoder.h"
+#include "ffmpeg_content.h"
+#include "safe_stringstream.h"
 
 #include "i18n.h"
 
-using std::stringstream;
 using std::string;
 using std::list;
+using std::pair;
+using std::make_pair;
 using std::cout;
 using boost::shared_ptr;
 using boost::weak_ptr;
-using libdcp::Size;
+using dcp::Size;
 
 /** Construct a FilterGraph for the settings in a piece of content.
  *  @param content Content.
  *  @param s Size of the images to process.
  *  @param p Pixel format of the images to process.
  */
-FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, libdcp::Size s, AVPixelFormat p)
-	: _buffer_src_context (0)
+FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, dcp::Size s, AVPixelFormat p)
+	: _copy (false)
+	, _buffer_src_context (0)
 	, _buffer_sink_context (0)
 	, _size (s)
 	, _pixel_format (p)
+	, _frame (0)
 {
-	_frame = av_frame_alloc ();
-	
-	string filters = Filter::ffmpeg_strings (content->filters()).first;
-	if (!filters.empty ()) {
-		filters += ",";
+	string const filters = Filter::ffmpeg_string (content->filters());
+	if (filters.empty ()) {
+		_copy = true;
+		return;
 	}
 
-	Crop crop = content->crop ();
-	libdcp::Size cropped_size = _size;
-	cropped_size.width -= crop.left + crop.right;
-	cropped_size.height -= crop.top + crop.bottom;
-	filters += crop_string (Position (crop.left, crop.top), cropped_size);
-
+	_frame = av_frame_alloc ();
+	
 	AVFilterGraph* graph = avfilter_graph_alloc();
 	if (graph == 0) {
 		throw DecodeError (N_("could not create filter graph."));
@@ -84,15 +83,13 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, libdcp::Size
 		throw DecodeError (N_("Could not create buffer sink filter"));
 	}
 
-	stringstream a;
+	SafeStringStream a;
 	a << "video_size=" << _size.width << "x" << _size.height << ":"
 	  << "pix_fmt=" << _pixel_format << ":"
 	  << "time_base=1/1:"
 	  << "pixel_aspect=1/1";
 
-	int r;
-
-	if ((r = avfilter_graph_create_filter (&_buffer_src_context, buffer_src, "in", a.str().c_str(), 0, graph)) < 0) {
+	if (avfilter_graph_create_filter (&_buffer_src_context, buffer_src, "in", a.str().c_str(), 0, graph) < 0) {
 		throw DecodeError (N_("could not create buffer source"));
 	}
 
@@ -128,35 +125,42 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, libdcp::Size
 		throw DecodeError (N_("could not configure filter graph."));
 	}
 
-	/* XXX: leaking `inputs' / `outputs' ? */
+	avfilter_inout_free (&inputs);
+	avfilter_inout_free (&outputs);
 }
 
 FilterGraph::~FilterGraph ()
 {
-	av_frame_free (&_frame);
+	if (_frame) {
+		av_frame_free (&_frame);
+	}
 }
 
 /** Take an AVFrame and process it using our configured filters, returning a
  *  set of Images.  Caller handles memory management of the input frame.
  */
-list<shared_ptr<Image> >
+list<pair<shared_ptr<Image>, int64_t> >
 FilterGraph::process (AVFrame* frame)
 {
-	list<shared_ptr<Image> > images;
-
-	if (av_buffersrc_write_frame (_buffer_src_context, frame) < 0) {
-		throw DecodeError (N_("could not push buffer into filter chain."));
-	}
+	list<pair<shared_ptr<Image>, int64_t> > images;
 
-	while (1) {
-		if (av_buffersink_get_frame (_buffer_sink_context, _frame) < 0) {
-			break;
+	if (_copy) {
+		images.push_back (make_pair (shared_ptr<Image> (new Image (frame)), av_frame_get_best_effort_timestamp (frame)));
+	} else {
+		if (av_buffersrc_write_frame (_buffer_src_context, frame) < 0) {
+			throw DecodeError (N_("could not push buffer into filter chain."));
+		}
+		
+		while (true) {
+			if (av_buffersink_get_frame (_buffer_sink_context, _frame) < 0) {
+				break;
+			}
+			
+			images.push_back (make_pair (shared_ptr<Image> (new Image (_frame)), av_frame_get_best_effort_timestamp (_frame)));
+			av_frame_unref (_frame);
 		}
-
-		images.push_back (shared_ptr<Image> (new SimpleImage (_frame)));
-		av_frame_unref (_frame);
 	}
-	
+		
 	return images;
 }
 
@@ -165,7 +169,7 @@ FilterGraph::process (AVFrame* frame)
  *  @return true if this chain can process images with `s' and `p', otherwise false.
  */
 bool
-FilterGraph::can_process (libdcp::Size s, AVPixelFormat p) const
+FilterGraph::can_process (dcp::Size s, AVPixelFormat p) const
 {
 	return (_size == s && _pixel_format == p);
 }