X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_filter_graph.cc;h=0eeeb3c4ae5858b094ffd4f5da58ab659f9d3b75;hp=f27befb035a814f1c677e9b6c48020b8a2e88526;hb=HEAD;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f

diff --git a/src/lib/audio_filter_graph.cc b/src/lib/audio_filter_graph.cc
index f27befb03..4e3052d57 100644
--- a/src/lib/audio_filter_graph.cc
+++ b/src/lib/audio_filter_graph.cc
@@ -18,21 +18,28 @@
 
 */
 
-#include "audio_filter_graph.h"
+
 #include "audio_buffers.h"
+#include "audio_filter_graph.h"
 #include "compose.hpp"
+#include "dcpomatic_assert.h"
+#include "exceptions.h"
 extern "C" {
 #include <libavfilter/buffersink.h>
 #include <libavfilter/buffersrc.h>
+#include <libavutil/channel_layout.h>
+#include <libavutil/opt.h>
 }
-#include <boost/make_shared.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
-using std::string;
+
 using std::cout;
-using boost::shared_ptr;
-using boost::make_shared;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+
 
 AudioFilterGraph::AudioFilterGraph (int sample_rate, int channels)
 	: _sample_rate (sample_rate)
@@ -48,6 +55,9 @@ AudioFilterGraph::AudioFilterGraph (int sample_rate, int channels)
 	}
 
 	_in_frame = av_frame_alloc ();
+	if (_in_frame == nullptr) {
+		throw std::bad_alloc();
+	}
 }
 
 AudioFilterGraph::~AudioFilterGraph()
@@ -58,40 +68,36 @@ AudioFilterGraph::~AudioFilterGraph()
 string
 AudioFilterGraph::src_parameters () const
 {
-	SafeStringStream a;
-
-	char buffer[64];
-	av_get_channel_layout_string (buffer, sizeof(buffer), 0, _channel_layout);
+	char layout[64];
+	av_get_channel_layout_string (layout, sizeof(layout), 0, _channel_layout);
 
-	a << "time_base=1/1:sample_rate=" << _sample_rate << ":"
-	  << "sample_fmt=" << av_get_sample_fmt_name(AV_SAMPLE_FMT_FLTP) << ":"
-	  << "channel_layout=" << buffer;
+	char buffer[256];
+	snprintf (
+		buffer, sizeof(buffer), "time_base=1/1:sample_rate=%d:sample_fmt=%s:channel_layout=%s",
+		_sample_rate, av_get_sample_fmt_name(AV_SAMPLE_FMT_FLTP), layout
+		);
 
-	return a.str ();
+	return buffer;
 }
 
-void *
-AudioFilterGraph::sink_parameters () const
-{
-	AVABufferSinkParams* sink_params = av_abuffersink_params_alloc ();
-
-	AVSampleFormat* sample_fmts = new AVSampleFormat[2];
-	sample_fmts[0] = AV_SAMPLE_FMT_FLTP;
-	sample_fmts[1] = AV_SAMPLE_FMT_NONE;
-	sink_params->sample_fmts = sample_fmts;
 
-	int64_t* channel_layouts = new int64_t[2];
-	channel_layouts[0] = _channel_layout;
-	channel_layouts[1] = -1;
-	sink_params->channel_layouts = channel_layouts;
+void
+AudioFilterGraph::set_parameters (AVFilterContext* context) const
+{
+	AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE };
+	int r = av_opt_set_int_list (context, "sample_fmts", sample_fmts, AV_SAMPLE_FMT_NONE, AV_OPT_SEARCH_CHILDREN);
+	DCPOMATIC_ASSERT (r >= 0);
 
-	sink_params->sample_rates = new int[2];
-	sink_params->sample_rates[0] = _sample_rate;
-	sink_params->sample_rates[1] = -1;
+	int64_t channel_layouts[] = { _channel_layout, -1 };
+	r = av_opt_set_int_list (context, "channel_layouts", channel_layouts, -1, AV_OPT_SEARCH_CHILDREN);
+	DCPOMATIC_ASSERT (r >= 0);
 
-	return sink_params;
+	int sample_rates[] = { _sample_rate, -1 };
+	r = av_opt_set_int_list (context, "sample_rates", sample_rates, -1, AV_OPT_SEARCH_CHILDREN);
+	DCPOMATIC_ASSERT (r >= 0);
 }
 
+
 string
 AudioFilterGraph::src_name () const
 {
@@ -105,8 +111,9 @@ AudioFilterGraph::sink_name () const
 }
 
 void
-AudioFilterGraph::process (shared_ptr<const AudioBuffers> buffers)
+AudioFilterGraph::process (shared_ptr<AudioBuffers> buffers)
 {
+	DCPOMATIC_ASSERT (buffers->frames() > 0);
 	int const process_channels = av_get_channel_layout_nb_channels (_channel_layout);
 	DCPOMATIC_ASSERT (process_channels >= buffers->channels());
 
@@ -115,7 +122,7 @@ AudioFilterGraph::process (shared_ptr<const AudioBuffers> buffers)
 		   the constructor) so we need to create new buffers with some extra
 		   silent channels.
 		*/
-		shared_ptr<AudioBuffers> extended_buffers = make_shared<AudioBuffers> (process_channels, buffers->frames());
+		auto extended_buffers = make_shared<AudioBuffers>(process_channels, buffers->frames());
 		for (int i = 0; i < buffers->channels(); ++i) {
 			extended_buffers->copy_channel_from (buffers.get(), i, i);
 		}
@@ -151,7 +158,7 @@ AudioFilterGraph::process (shared_ptr<const AudioBuffers> buffers)
 	if (r < 0) {
 		char buffer[256];
 		av_strerror (r, buffer, sizeof(buffer));
-		throw DecodeError (String::compose (N_("could not push buffer into filter chain (%1)"), buffer));
+		throw DecodeError (String::compose (N_("could not push buffer into filter chain (%1)"), &buffer[0]));
 	}
 
 	while (true) {