diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-27 20:55:51 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-02 13:38:21 +0100 |
| commit | 0a93237cb5e4642d3b698ff9b7d0cfae5401478c (patch) | |
| tree | b0d5255ae2b90d1c9ef489e78239c2f081ea0a9e /src/lib/dcp_decoder.cc | |
| parent | 608c146eb09fac2a8fc60e1a72591f6bb8364e1f (diff) | |
Handle multiple audio streams in a single piece of content
in a similar way to the V1 patch.
Diffstat (limited to 'src/lib/dcp_decoder.cc')
| -rw-r--r-- | src/lib/dcp_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 3bfbd7720..0411ad941 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -89,7 +89,7 @@ DCPDecoder::pass (PassReason) shared_ptr<const dcp::SoundFrame> sf = (*_reel)->main_sound()->mxf()->get_frame (entry_point + frame); uint8_t const * from = sf->data (); - int const channels = _dcp_content->audio_channels (); + int const channels = _dcp_content->audio_stream()->channels (); int const frames = sf->size() / (3 * channels); shared_ptr<AudioBuffers> data (new AudioBuffers (channels, frames)); for (int i = 0; i < frames; ++i) { @@ -99,7 +99,7 @@ DCPDecoder::pass (PassReason) } } - audio (data, _next); + audio (_dcp_content->audio_stream(), data, _next); } /* XXX: subtitle */ |