From 9579bfdec2fab28fc221e397cf848a08e48f6840 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 9 May 2014 22:51:30 +0100 Subject: MAX_AUDIO_CHANNELS -> MAX_DCP_AUDIO_CHANNELS. --- src/lib/audio_mapping.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/audio_mapping.cc') diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc index ae7702998..28a0fc380 100644 --- a/src/lib/audio_mapping.cc +++ b/src/lib/audio_mapping.cc @@ -53,7 +53,7 @@ AudioMapping::setup (int c) _gain.resize (_content_channels); for (int i = 0; i < _content_channels; ++i) { - _gain[i].resize (MAX_AUDIO_CHANNELS); + _gain[i].resize (MAX_DCP_AUDIO_CHANNELS); } } @@ -61,7 +61,7 @@ void AudioMapping::make_default () { for (int i = 0; i < _content_channels; ++i) { - for (int j = 0; j < MAX_AUDIO_CHANNELS; ++j) { + for (int j = 0; j < MAX_DCP_AUDIO_CHANNELS; ++j) { _gain[i][j] = 0; } } @@ -117,7 +117,7 @@ AudioMapping::as_xml (xmlpp::Node* node) const node->add_child ("ContentChannels")->add_child_text (lexical_cast (_content_channels)); for (int c = 0; c < _content_channels; ++c) { - for (int d = 0; d < MAX_AUDIO_CHANNELS; ++d) { + for (int d = 0; d < MAX_DCP_AUDIO_CHANNELS; ++d) { xmlpp::Element* t = node->add_child ("Gain"); t->set_attribute ("Content", lexical_cast (c)); t->set_attribute ("DCP", lexical_cast (d)); -- cgit v1.2.3 From 283770d0bdde7ba4d1f7bc4b1a7d1812bff5c835 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 9 May 2014 22:55:43 +0100 Subject: Fix crash on using content with more than 12 audio channels. Reported-by: Sumit --- ChangeLog | 2 ++ src/lib/audio_mapping.cc | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/lib/audio_mapping.cc') diff --git a/ChangeLog b/ChangeLog index f76c6ba35..21b6eec15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-05-09 Carl Hetherington + * Fix crash on using content with more than 12 audio channels. + * Re-introduce ffprobe call when adding content. 2014-05-02 Carl Hetherington diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc index 28a0fc380..301d44fa6 100644 --- a/src/lib/audio_mapping.cc +++ b/src/lib/audio_mapping.cc @@ -28,6 +28,7 @@ using std::cout; using std::make_pair; using std::pair; using std::string; +using std::min; using boost::shared_ptr; using boost::lexical_cast; using boost::dynamic_pointer_cast; @@ -71,7 +72,7 @@ AudioMapping::make_default () set (0, libdcp::CENTRE, 1); } else { /* 1:1 mapping */ - for (int i = 0; i < _content_channels; ++i) { + for (int i = 0; i < min (_content_channels, MAX_DCP_AUDIO_CHANNELS); ++i) { set (i, static_cast (i), 1); } } -- cgit v1.2.3