Report the number of active channels in DCPs, not the number in the MXF.
authorCarl Hetherington <cth@carlh.net>
Sun, 28 May 2023 21:35:25 +0000 (23:35 +0200)
committerCarl Hetherington <cth@carlh.net>
Sun, 28 May 2023 21:35:25 +0000 (23:35 +0200)
cscript
src/lib/dcp_examiner.cc

diff --git a/cscript b/cscript
index c0346cc7df08e81c66060a2a91118fa4f2085997..afbfce0fc08f66444a9454ce67dccdbad6225c78 100644 (file)
--- a/cscript
+++ b/cscript
@@ -480,7 +480,7 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.70'))
+    deps.append(('libdcp', 'v1.8.72'))
     deps.append(('libsub', 'v1.6.44'))
     deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae'))
     deps.append(('rtaudio', 'f619b76'))
index 9c4f899c6d0fd6697e70e0cc1238856bbc3116d8..50b19e2fd2918b01d0a953919af4ac531f0619cc 100644 (file)
@@ -175,8 +175,8 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
                        auto asset = reel->main_sound()->asset();
 
                        if (!_audio_channels) {
-                               _audio_channels = asset->channels ();
-                       } else if (_audio_channels.get() != asset->channels ()) {
+                               _audio_channels = asset->active_channels();
+                       } else if (_audio_channels.get() != asset->active_channels()) {
                                throw DCPError (_("Mismatched audio channel counts in DCP"));
                        }