Various fixes to make audio analysis sort-of work.

[dcpomatic.git] / src / lib / audio_decoder.cc

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index bbd4ced6c1a2c114f337729f8fe609f71e1eb353..a9e01908c4782a6095821d080800b0568ce71214 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -59,10 +59,10 @@ AudioDecoder::AudioDecoder (shared_ptr<const Film> f, shared_ptr<const AudioCont
 
                _swr_context = swr_alloc_set_opts (
                        0,
-                       av_get_default_channel_layout (MAX_AUDIO_CHANNELS),
+                       av_get_default_channel_layout (_audio_content->audio_channels ()),
                        AV_SAMPLE_FMT_FLTP,
                        _audio_content->output_audio_frame_rate(),
-                       av_get_default_channel_layout (MAX_AUDIO_CHANNELS),
+                       av_get_default_channel_layout (_audio_content->audio_channels ()),
                        AV_SAMPLE_FMT_FLTP,
                        _audio_content->content_audio_frame_rate(),
                        0, 0
@@ -152,7 +152,6 @@ AudioDecoder::audio (shared_ptr<const AudioBuffers> data, Time time)
        }
 
        Audio (dcp_mapped, time);
-       cout << "bumping n.a. by " << data->frames() << " ie " << film->audio_frames_to_time(data->frames()) << "\n";
        _next_audio = time + film->audio_frames_to_time (data->frames());
 }