X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_filter_graph.cc;h=fc43b5a344a972a9ef20d69e1257441024616412;hb=89952bc64f5ae1b075b653f8a9daa02fd8d90260;hp=6318c68ab58fbced508595bd74cbac9c8632706c;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/lib/audio_filter_graph.cc b/src/lib/audio_filter_graph.cc
index 6318c68ab..fc43b5a34 100644
--- a/src/lib/audio_filter_graph.cc
+++ b/src/lib/audio_filter_graph.cc
@@ -25,6 +25,7 @@ extern "C" {
 #include <libavfilter/buffersink.h>
 #include <libavfilter/buffersrc.h>
 #include <libavutil/channel_layout.h>
+#include <libavutil/opt.h>
 }
 #include <iostream>
 
@@ -70,28 +71,24 @@ AudioFilterGraph::src_parameters () const
 	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
 {