X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ffilter_graph.cc;h=fc6b9033ac97805e01b4ea45aaeca6dc6fb41208;hp=2fb1ad187edf51f9d8813d259f483a38c4fed362;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0

diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index 2fb1ad187..fc6b9033a 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,17 +18,18 @@
 
 */
 
+
 /** @file src/lib/filter_graph.cc
  *  @brief A graph of FFmpeg filters.
  */
 
+
 #include "filter_graph.h"
 #include "filter.h"
 #include "exceptions.h"
 #include "image.h"
 #include "compose.hpp"
 extern "C" {
-#include <libavfilter/avfiltergraph.h>
 #include <libavfilter/buffersrc.h>
 #include <libavfilter/buffersink.h>
 #include <libavformat/avio.h>
@@ -37,32 +38,23 @@ extern "C" {
 
 #include "i18n.h"
 
+
 using std::string;
 using std::list;
 using std::pair;
 using std::make_pair;
 using std::cout;
 using std::vector;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using dcp::Size;
 
-/** Construct a FilterGraph for the settings in a piece of content */
-FilterGraph::FilterGraph ()
-	: _graph (0)
-	, _copy (false)
-	, _buffer_src_context (0)
-	, _buffer_sink_context (0)
-	, _frame (0)
-{
-
-}
 
 void
 FilterGraph::setup (vector<Filter const *> filters)
 {
-	string const filters_string = Filter::ffmpeg_string (filters);
-	if (filters.empty ()) {
+	auto const filters_string = Filter::ffmpeg_string (filters);
+	if (filters.empty()) {
 		_copy = true;
 		return;
 	}
@@ -74,12 +66,12 @@ FilterGraph::setup (vector<Filter const *> filters)
 		throw DecodeError (N_("could not create filter graph."));
 	}
 
-	AVFilter* buffer_src = avfilter_get_by_name (src_name().c_str());
+	auto const buffer_src = avfilter_get_by_name (src_name().c_str());
 	if (!buffer_src) {
 		throw DecodeError (N_("could not find buffer src filter"));
 	}
 
-	AVFilter* buffer_sink = avfilter_get_by_name (sink_name().c_str());
+	auto const buffer_sink = avfilter_get_by_name (sink_name().c_str());
 	if (!buffer_sink) {
 		throw DecodeError (N_("Could not create buffer sink filter"));
 	}
@@ -88,21 +80,19 @@ FilterGraph::setup (vector<Filter const *> filters)
 		throw DecodeError (N_("could not create buffer source"));
 	}
 
-	void* sink_params = sink_parameters ();
-
-	if (avfilter_graph_create_filter (&_buffer_sink_context, buffer_sink, N_("out"), 0, sink_params, _graph) < 0) {
+	if (avfilter_graph_create_filter (&_buffer_sink_context, buffer_sink, N_("out"), nullptr, nullptr, _graph) < 0) {
 		throw DecodeError (N_("could not create buffer sink."));
 	}
 
-	av_free (sink_params);
+	set_parameters (_buffer_sink_context);
 
-	AVFilterInOut* outputs = avfilter_inout_alloc ();
+	auto outputs = avfilter_inout_alloc ();
 	outputs->name = av_strdup(N_("in"));
 	outputs->filter_ctx = _buffer_src_context;
 	outputs->pad_idx = 0;
 	outputs->next = 0;
 
-	AVFilterInOut* inputs = avfilter_inout_alloc ();
+	auto inputs = avfilter_inout_alloc ();
 	inputs->name = av_strdup(N_("out"));
 	inputs->filter_ctx = _buffer_sink_context;
 	inputs->pad_idx = 0;
@@ -112,11 +102,13 @@ FilterGraph::setup (vector<Filter const *> filters)
 		throw DecodeError (N_("could not set up filter graph."));
 	}
 
-	if (avfilter_graph_config (_graph, 0) < 0) {
-		throw DecodeError (N_("could not configure filter graph."));
+	int e = avfilter_graph_config (_graph, 0);
+	if (e < 0) {
+		throw DecodeError (String::compose(N_("could not configure filter graph (%1)"), e));
 	}
 }
 
+
 FilterGraph::~FilterGraph ()
 {
 	if (_frame) {
@@ -128,8 +120,9 @@ FilterGraph::~FilterGraph ()
 	}
 }
 
+
 AVFilterContext *
 FilterGraph::get (string name)
 {
-	return avfilter_graph_get_filter (_graph, name.c_str ());
+	return avfilter_graph_get_filter (_graph, name.c_str());
 }