From ee0a4116a5526f0d6ae8fa763519b7bedd2dcce6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 25 Jul 2023 13:11:14 +0200 Subject: Add audio_channels_to_write_to_mxf(). --- src/lib/film_util.cc | 15 +++++++++++++++ src/lib/film_util.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/src/lib/film_util.cc b/src/lib/film_util.cc index 34f48d5a3..d196a1ee2 100644 --- a/src/lib/film_util.cc +++ b/src/lib/film_util.cc @@ -32,3 +32,18 @@ channel_is_mapped(shared_ptr film, dcp::Channel channel) auto const mapped = film->mapped_audio_channels(); return std::find(mapped.begin(), mapped.end(), static_cast(channel)) != mapped.end(); } + + +int +audio_channels_to_write_to_mxf(shared_ptr film) +{ + if (film->interop()) { + return film->audio_channels(); + } + + /* Compromise to try and avoid validation errors in some cases with DCPs that + * don't have 8 or 16 channels (see bug #2443). + */ + return film->audio_channels() > 8 ? 16 : 8; +} + diff --git a/src/lib/film_util.h b/src/lib/film_util.h index f5b91f1f5..394b68380 100644 --- a/src/lib/film_util.h +++ b/src/lib/film_util.h @@ -26,3 +26,5 @@ class Film; bool channel_is_mapped(std::shared_ptr film, dcp::Channel channel); +int audio_channels_to_write_to_mxf(std::shared_ptr film); + -- cgit v1.2.3