diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-07-17 23:14:38 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-07-17 23:14:39 +0200 |
| commit | ca9a8a60df3d2040af9caa7bc5079c55a1921acb (patch) | |
| tree | 953a001d212b98ca3d698a6577517e7fd4ec533f | |
| parent | 2895136569983960819a3034c08724e16e389659 (diff) | |
This check used to be for asset channel count mismatches, then it was
changed to the active count, but I don't think it should be an error
to have different active counts between assets of a single DCP.
| -rw-r--r-- | src/lib/dcp_examiner.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc index e369b46ff..3163f59c4 100644 --- a/src/lib/dcp_examiner.cc +++ b/src/lib/dcp_examiner.cc @@ -180,11 +180,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant) throw DCPError (_("Mismatched audio channel counts in DCP")); } - if (!_active_audio_channels) { - _active_audio_channels = asset->active_channels(); - } else if (_active_audio_channels.get() != asset->active_channels()) { - throw DCPError(_("Mismatched active audio channel counts in DCP")); - } + _active_audio_channels = std::max(_active_audio_channels.get_value_or(0), asset->active_channels()); if (!_audio_frame_rate) { _audio_frame_rate = asset->sampling_rate (); |