From c047da0a3ee78f8066ef65cdbcd978cdd67fb42e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 21 Mar 2023 00:37:12 +0100
Subject: Allow specification of channels that need a MCASubDescriptor.

---
 src/cpl.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/cpl.cc')

diff --git a/src/cpl.cc b/src/cpl.cc
index 33a690f3..c862a853 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -385,6 +385,7 @@ CPL::write_mca_subdescriptors(xmlpp::Element* parent, shared_ptr<const SoundAsse
 			sf->add_child("RFC5646SpokenLanguage", "r1")->add_child_text(buffer);
 		}
 
+		/* Find the MCA subdescriptors in the MXF so that we can also write them here */
 		list<ASDCP::MXF::InterchangeObject*> channels;
 		auto r = reader->reader()->OP1aHeader().GetMDObjectsByType(
 			asdcp_smpte_dict->ul(ASDCP::MDD_AudioChannelLabelSubDescriptor),
@@ -393,9 +394,6 @@ CPL::write_mca_subdescriptors(xmlpp::Element* parent, shared_ptr<const SoundAsse
 
 		for (auto i: channels) {
 			auto channel = reinterpret_cast<ASDCP::MXF::AudioChannelLabelSubDescriptor*>(i);
-			if (static_cast<int>(channel->MCAChannelID) > asset->channels()) {
-				continue;
-			}
 			auto ch = mca_subs->add_child("AudioChannelLabelSubDescriptor", "r0");
 			channel->InstanceUID.EncodeString(buffer, sizeof(buffer));
 			ch->add_child("InstanceID", "r1")->add_child_text("urn:uuid:" + string(buffer));
-- 
cgit v1.2.3