diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-20 17:34:23 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-20 21:20:38 +0100 |
| commit | 50cb31af16240b248700dab1484d7f07656c66df (patch) | |
| tree | 393568f3c24506ac6b004346b9ef5101f9fdcf61 /src/lib/audio_decoder.cc | |
| parent | edfd92e5554e3389e6456f497f44ca6e866800bf (diff) | |
Various fixes to make audio analysis sort-of work.
Diffstat (limited to 'src/lib/audio_decoder.cc')
| -rw-r--r-- | src/lib/audio_decoder.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc index bbd4ced6c..a9e01908c 100644 --- 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()); } |