X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilter_graph.cc;h=a8159350994f2a429740f8f4d16231e4512ff0b0;hb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;hp=639992d70747a37d1a5d89091c6cdb8bb0c566b4;hpb=0b6c6de07f9a3aa28c2e8ca8ef30340e3fa1bfc6;p=dcpomatic.git

diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index 639992d70..a81593509 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -21,6 +21,13 @@
  *  @brief A graph of FFmpeg filters.
  */
 
+#include "filter_graph.h"
+#include "filter.h"
+#include "exceptions.h"
+#include "image.h"
+#include "ffmpeg_content.h"
+#include "safe_stringstream.h"
+#include "compose.hpp"
 extern "C" {
 #include <libavfilter/avfiltergraph.h>
 #include <libavfilter/buffersrc.h>
@@ -28,13 +35,7 @@ extern "C" {
 #include <libavfilter/buffersink.h>
 #include <libavformat/avio.h>
 }
-#include "decoder.h"
-#include "filter_graph.h"
-#include "filter.h"
-#include "exceptions.h"
-#include "image.h"
-#include "ffmpeg_content.h"
-#include "safe_stringstream.h"
+#include <iostream>
 
 #include "i18n.h"
 
@@ -45,26 +46,29 @@ 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_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."));
@@ -95,7 +99,7 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, libdcp::Size
 	pixel_fmts[0] = _pixel_format;
 	pixel_fmts[1] = PIX_FMT_NONE;
 	sink_params->pixel_fmts = pixel_fmts;
-	
+
 	if (avfilter_graph_create_filter (&_buffer_sink_context, buffer_sink, N_("out"), 0, sink_params, graph) < 0) {
 		throw DecodeError (N_("could not create buffer sink."));
 	}
@@ -117,17 +121,17 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, libdcp::Size
 	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."));
 	}
-
-	/* XXX: leaking `inputs' / `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
@@ -138,19 +142,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 (true) {
-		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));
 		}
 
-		images.push_back (make_pair (shared_ptr<Image> (new Image (_frame)), av_frame_get_best_effort_timestamp (_frame)));
-		av_frame_unref (_frame);
+		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);
+		}
 	}
-	
+
 	return images;
 }
 
@@ -159,7 +168,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);
 }