From ca9a8a60df3d2040af9caa7bc5079c55a1921acb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 17 Jul 2023 23:14:38 +0200 Subject: 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. --- src/lib/dcp_examiner.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/lib') 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 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 (); -- cgit v1.2.3