X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilter_graph.cc;h=9f80118bd468be8f6df388d7931b3f501af13e27;hb=53eea12d3e0d7925d5949de92859bc358ee0adcc;hp=5add16d19bcedac612b55eecf5bc85a7feedf99a;hpb=39bc73fe192f932ed6695eb87b19de446e8b4f55;p=dcpomatic.git

diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index 5add16d19..9f80118bd 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -34,10 +34,10 @@ extern "C" {
 #include "exceptions.h"
 #include "image.h"
 #include "ffmpeg_content.h"
+#include "safe_stringstream.h"
 
 #include "i18n.h"
 
-using std::stringstream;
 using std::string;
 using std::list;
 using std::pair;
@@ -53,18 +53,21 @@ using dcp::Size;
  *  @param p Pixel format of the images to process.
  */
 FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, dcp::Size s, AVPixelFormat p)
-	: _buffer_src_context (0)
+	: _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_string (content->filters());
+	string const filters = Filter::ffmpeg_string (content->filters());
 	if (filters.empty ()) {
-		filters = "copy";
+		_copy = true;
+		return;
 	}
 
+	_frame = av_frame_alloc ();
+	
 	AVFilterGraph* graph = avfilter_graph_alloc();
 	if (graph == 0) {
 		throw DecodeError (N_("could not create filter graph."));
@@ -80,7 +83,7 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, dcp::Size s,
 		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:"
@@ -114,21 +117,20 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, dcp::Size s,
 	inputs->pad_idx = 0;
 	inputs->next = 0;
 
-	if (avfilter_graph_parse (graph, filters.c_str(), &inputs, &outputs, 0) < 0) {
+	if (avfilter_graph_parse (graph, filters.c_str(), inputs, outputs, 0) < 0) {
 		throw DecodeError (N_("could not set up filter graph."));
 	}
 	
 	if (avfilter_graph_config (graph, 0) < 0) {
 		throw DecodeError (N_("could not configure filter graph."));
 	}
-
-	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
@@ -139,19 +141,24 @@ FilterGraph::process (AVFrame* frame)
 {
 	list<pair<shared_ptr<Image>, int64_t> > images;
 
-	if (av_buffersrc_write_frame (_buffer_src_context, frame) < 0) {
-		throw DecodeError (N_("could not push buffer into filter chain."));
-	}
-
-	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 {
+		int r = av_buffersrc_write_frame (_buffer_src_context, frame);
+		if (r < 0) {
+			throw DecodeError (String::compose (N_("could not push buffer into filter chain (%1)."), r));
+		}
+		
+		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 (make_pair (shared_ptr<Image> (new Image (_frame)), av_frame_get_best_effort_timestamp (_frame)));
-		av_frame_unref (_frame);
 	}
-	
+		
 	return images;
 }