*/
-#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 <iostream>
#include "i18n.h"
+
+using std::cout;
+using std::make_shared;
+using std::shared_ptr;
using std::string;
-using boost::shared_ptr;
+
AudioFilterGraph::AudioFilterGraph (int sample_rate, int channels)
: _sample_rate (sample_rate)
/* FFmpeg doesn't know any channel layouts for any counts between 8 and 16,
so we need to tell it we're using 16 channels if we are using more than 8.
*/
- if (_channels > 8) {
- _channel_layout = av_get_default_channel_layout (16);
- } else {
- _channel_layout = av_get_default_channel_layout (_channels);
- }
+ av_channel_layout_default(&_channel_layout, _channels > 8 ? 16 : _channels);
_in_frame = av_frame_alloc ();
+ if (_in_frame == nullptr) {
+ throw std::bad_alloc();
+ }
}
AudioFilterGraph::~AudioFilterGraph()
AudioFilterGraph::src_parameters () const
{
char layout[64];
- av_get_channel_layout_string (layout, sizeof(layout), 0, _channel_layout);
+ av_channel_layout_describe(&_channel_layout, layout, sizeof(layout));
char buffer[256];
snprintf (
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;
-
- sink_params->sample_rates = new int[2];
- sink_params->sample_rates[0] = _sample_rate;
- sink_params->sample_rates[1] = -1;
- return sink_params;
+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);
+
+ char ch_layout[64];
+ av_channel_layout_describe(&_channel_layout, ch_layout, sizeof(ch_layout));
+ r = av_opt_set(context, "ch_layouts", ch_layout, AV_OPT_SEARCH_CHILDREN);
+ DCPOMATIC_ASSERT (r >= 0);
+
+ 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
{
}
void
-AudioFilterGraph::process (shared_ptr<const AudioBuffers> buffers)
+AudioFilterGraph::process (shared_ptr<AudioBuffers> buffers)
{
- int const process_channels = av_get_channel_layout_nb_channels (_channel_layout);
+ DCPOMATIC_ASSERT (buffers->frames() > 0);
+ int const process_channels = _channel_layout.nb_channels;
DCPOMATIC_ASSERT (process_channels >= buffers->channels());
if (buffers->channels() < process_channels) {
the constructor) so we need to create new buffers with some extra
silent channels.
*/
- shared_ptr<AudioBuffers> extended_buffers (new 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);
}
_in_frame->nb_samples = buffers->frames ();
_in_frame->format = AV_SAMPLE_FMT_FLTP;
_in_frame->sample_rate = _sample_rate;
- _in_frame->channel_layout = _channel_layout;
+ _in_frame->ch_layout = _channel_layout;
+LIBDCP_DISABLE_WARNINGS
_in_frame->channels = process_channels;
+LIBDCP_ENABLE_WARNINGS
int r = av_buffersrc_write_frame (_buffer_src_context, _in_frame);