summaryrefslogtreecommitdiff
path: root/src/lib/player.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-12 13:49:57 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-12 13:49:57 +0100
commitd19b7cbd3d1a428697bc9b26fdc0be36fafa444a (patch)
tree599e541098b179841c0fc268c5539dd4a0f87499 /src/lib/player.cc
parentf0233eb1e3d6dfd9284d6c5e4865011550e2a0e3 (diff)
Add silence padding test.
Diffstat (limited to 'src/lib/player.cc')
-rw-r--r--src/lib/player.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 7ab72d9a1..61764a39d 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -271,7 +271,9 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
dcp_mapped->make_silent ();
list<pair<int, libdcp::Channel> > map = content->audio_mapping().content_to_dcp ();
for (list<pair<int, libdcp::Channel> >::iterator i = map.begin(); i != map.end(); ++i) {
- dcp_mapped->accumulate_channel (audio.get(), i->first, i->second);
+ if (i->first < audio->channels() && i->second < dcp_mapped->channels()) {
+ dcp_mapped->accumulate_channel (audio.get(), i->first, i->second);
+ }
}
audio = dcp_mapped;