X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_filter_graph.cc;h=0eeeb3c4ae5858b094ffd4f5da58ab659f9d3b75;hb=0a3f387f5d39da2ca38ec90a9593c1b598040dd7;hp=6b70300fce195550eee6b2eec22b83d714ede4e1;hpb=422be0eece2bf6ee80db1d3c21553cd82efff789;p=dcpomatic.git

diff --git a/src/lib/audio_filter_graph.cc b/src/lib/audio_filter_graph.cc
index 6b70300fc..0eeeb3c4a 100644
--- a/src/lib/audio_filter_graph.cc
+++ b/src/lib/audio_filter_graph.cc
@@ -24,7 +24,9 @@
 extern "C" {
 #include <libavfilter/buffersink.h>
 #include <libavfilter/buffersrc.h>
+#include <libavutil/channel_layout.h>
 }
+#include <iostream>
 
 #include "i18n.h"
 
@@ -56,16 +58,16 @@ AudioFilterGraph::~AudioFilterGraph()
 string
 AudioFilterGraph::src_parameters () const
 {
-	locked_stringstream a;
+	char layout[64];
+	av_get_channel_layout_string (layout, sizeof(layout), 0, _channel_layout);
 
-	char buffer[64];
-	av_get_channel_layout_string (buffer, sizeof(buffer), 0, _channel_layout);
+	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
+		);
 
-	a << "time_base=1/1:sample_rate=" << _sample_rate << ":"
-	  << "sample_fmt=" << av_get_sample_fmt_name(AV_SAMPLE_FMT_FLTP) << ":"
-	  << "channel_layout=" << buffer;
-
-	return a.str ();
+	return buffer;
 }
 
 void *
@@ -105,6 +107,7 @@ AudioFilterGraph::sink_name () const
 void
 AudioFilterGraph::process (shared_ptr<const 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());
 
@@ -149,7 +152,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) {