diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-14 00:48:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-14 00:48:27 +0100 |
| commit | 7fb622a18582f18fcc6cfe140a262fd6cc8cad88 (patch) | |
| tree | 7d4a6d849cc276aada1df1d4bc16f97c7f25c0bb /src/lib/encoder.cc | |
| parent | 8c4b46f9fc316327e5e9e83e711dfa21bbde4935 (diff) | |
Fix mapping of audio in DCP.
Diffstat (limited to 'src/lib/encoder.cc')
| -rw-r--r-- | src/lib/encoder.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index b897c8a31..d6a57ae6b 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -135,9 +135,9 @@ void Encoder::process_end () { #if HAVE_SWRESAMPLE - if (_film->has_audio() && _film->audio_channels() && _swr_context) { + if (_film->has_audio() && _swr_context) { - shared_ptr<AudioBuffers> out (new AudioBuffers (_film->audio_channels(), 256)); + shared_ptr<AudioBuffers> out (new AudioBuffers (_film->audio_mapping().dcp_channels(), 256)); while (1) { int const frames = swr_convert (_swr_context, (uint8_t **) out->data(), 256, 0, 0); @@ -312,7 +312,7 @@ Encoder::process_audio (shared_ptr<AudioBuffers> data) /* Compute the resampled frames count and add 32 for luck */ int const max_resampled_frames = ceil ((int64_t) data->frames() * _film->target_audio_sample_rate() / _film->audio_frame_rate()) + 32; - shared_ptr<AudioBuffers> resampled (new AudioBuffers (_film->audio_channels(), max_resampled_frames)); + shared_ptr<AudioBuffers> resampled (new AudioBuffers (_film->audio_mapping().dcp_channels(), max_resampled_frames)); /* Resample audio */ int const resampled_frames = swr_convert ( |