using std::cout;
using boost::shared_ptr;
-AudioFilterGraph::AudioFilterGraph (int sample_rate, int64_t channel_layout)
+AudioFilterGraph::AudioFilterGraph (int sample_rate, int channels)
: _sample_rate (sample_rate)
- , _channel_layout (channel_layout)
+ , _channels (channels)
{
+ /* 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);
+ }
+
_in_frame = av_frame_alloc ();
}
void
AudioFilterGraph::process (shared_ptr<const AudioBuffers> buffers)
{
- _in_frame->extended_data = new uint8_t*[buffers->channels()];
+ int const process_channels = av_get_channel_layout_nb_channels (_channel_layout);
+ DCPOMATIC_ASSERT (process_channels >= buffers->channels());
+
+ if (buffers->channels() < process_channels) {
+ /* We are processing more data than we actually have (see the hack in
+ 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()));
+ for (int i = 0; i < buffers->channels(); ++i) {
+ extended_buffers->copy_channel_from (buffers.get(), i, i);
+ }
+ for (int i = buffers->channels(); i < process_channels; ++i) {
+ extended_buffers->make_silent (i);
+ }
+
+ buffers = extended_buffers;
+ }
+
+ _in_frame->extended_data = new uint8_t*[process_channels];
for (int i = 0; i < buffers->channels(); ++i) {
if (i < AV_NUM_DATA_POINTERS) {
_in_frame->data[i] = reinterpret_cast<uint8_t*> (buffers->data(i));
_in_frame->format = AV_SAMPLE_FMT_FLTP;
_in_frame->sample_rate = _sample_rate;
_in_frame->channel_layout = _channel_layout;
- _in_frame->channels = av_get_channel_layout_nb_channels (_channel_layout);
+ _in_frame->channels = process_channels;
int r = av_buffersrc_write_frame (_buffer_src_context, _in_frame);
JobManager::instance()->add (job);
wait_for_jobs ();
}
+
+
+static bool done = false;
+
+static void
+analysis_finished ()
+{
+ done = true;
+}
+
+/* Test a case which was reported to throw an exception; analysing
+ * a 12-channel DCP's audio.
+ */
+BOOST_AUTO_TEST_CASE (audio_analysis_test3)
+{
+ shared_ptr<Film> film = new_test_film ("analyse_audio_test");
+ film->set_container (Ratio::from_id ("185"));
+ film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
+ film->set_name ("frobozz");
+
+ shared_ptr<SndfileContent> content (new SndfileContent (film, "test/data/white.wav"));
+ film->examine_and_add_content (content);
+ wait_for_jobs ();
+
+ film->set_audio_channels (12);
+ boost::signals2::connection connection;
+ JobManager::instance()->analyse_audio (film, film->playlist(), connection, boost::bind (&analysis_finished));
+ wait_for_jobs ();
+ BOOST_CHECK (done);
+}