Don't write MCA subdescriptors for channels that don't exist in the MXF (#2631).v1.8.86

This causes some test ID churn.

6 files changed, 143 insertions, 0 deletions

diff --git a/test/data/DCP/ASSETMAP.xml b/test/data/DCP/ASSETMAP.xml
new file mode 100644
index 00000000..e5bee939
--- /dev/null
+++ b/test/data/DCP/ASSETMAP.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM">
+  <Id>urn:uuid:76aef948-ca63-4d4a-b707-27727c55d370</Id>
+  <AnnotationText>Created by libdcp</AnnotationText>
+  <Creator>OpenDCP 0.0.25</Creator>
+  <VolumeCount>1</VolumeCount>
+  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
+  <Issuer>OpenDCP 0.0.25</Issuer>
+  <AssetList>
+    <Asset>
+      <Id>urn:uuid:d76fdaaf-8316-42dc-a87e-1719ad6ca3ca</Id>
+      <PackingList>true</PackingList>
+      <ChunkList>
+        <Chunk>
+          <Path>pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml</Path>
+          <VolumeIndex>1</VolumeIndex>
+          <Offset>0</Offset>
+          <Length>1380</Length>
+        </Chunk>
+      </ChunkList>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
+      <ChunkList>
+        <Chunk>
+          <Path>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</Path>
+          <VolumeIndex>1</VolumeIndex>
+          <Offset>0</Offset>
+          <Length>2024</Length>
+        </Chunk>
+      </ChunkList>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
+      <ChunkList>
+        <Chunk>
+          <Path>video.mxf</Path>
+          <VolumeIndex>1</VolumeIndex>
+          <Offset>0</Offset>
+          <Length>40144</Length>
+        </Chunk>
+      </ChunkList>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa</Id>
+      <ChunkList>
+        <Chunk>
+          <Path>audio.mxf</Path>
+          <VolumeIndex>1</VolumeIndex>
+          <Offset>0</Offset>
+          <Length>161326</Length>
+        </Chunk>
+      </ChunkList>
+    </Asset>
+  </AssetList>
+</AssetMap>
diff --git a/test/data/DCP/VOLINDEX.xml b/test/data/DCP/VOLINDEX.xml
new file mode 100644
index 00000000..f66c004a
--- /dev/null
+++ b/test/data/DCP/VOLINDEX.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VolumeIndex xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM">
+  <Index>1</Index>
+</VolumeIndex>
diff --git a/test/data/DCP/audio.mxf b/test/data/DCP/audio.mxf
new file mode 100644
index 00000000..947865e1
--- /dev/null
+++ b/test/data/DCP/audio.mxf
diff --git a/test/data/DCP/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/data/DCP/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
new file mode 100644
index 00000000..5fa3643b
--- /dev/null
+++ b/test/data/DCP/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL">
+  <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
+  <AnnotationText>A Test DCP</AnnotationText>
+  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
+  <Issuer>OpenDCP 0.0.25</Issuer>
+  <Creator>OpenDCP 0.0.25</Creator>
+  <ContentTitleText>A Test DCP</ContentTitleText>
+  <ContentKind>feature</ContentKind>
+  <ContentVersion>
+    <Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id>
+    <LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText>
+  </ContentVersion>
+  <RatingList/>
+  <ReelList>
+    <Reel>
+      <Id>urn:uuid:8577c7c0-be29-4eb5-a449-1e3870a42bbd</Id>
+      <AssetList>
+        <MainPicture>
+          <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>24</Duration>
+          <Hash>o3VmpdFsNUgF11oadcaGJ/IfO0M=</Hash>
+          <FrameRate>24 1</FrameRate>
+          <ScreenAspectRatio>1998 1080</ScreenAspectRatio>
+        </MainPicture>
+        <MainSound>
+          <Id>urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa</Id>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>24</Duration>
+          <Hash>l+XLgxe2fMZDgY+0QYzDfGhvTQM=</Hash>
+        </MainSound>
+        <axd:AuxData xmlns:axd="http://www.dolby.com/schemas/2012/AD">
+          <Id>urn:uuid:b68febcc-5ddf-489a-84a7-924f29fa2afd</Id>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>1489</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>1489</Duration>
+          <Hash>jo8pQSebhScPN4EVvvpIUWRrDeM=</Hash>
+          <axd:DataType>urn:smpte:ul:060e2b34.04010105.0e090604.00000000</axd:DataType>
+        </axd:AuxData>
+      </AssetList>
+    </Reel>
+  </ReelList>
+</CompositionPlaylist>
diff --git a/test/data/DCP/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml b/test/data/DCP/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml
new file mode 100644
index 00000000..49fd579b
--- /dev/null
+++ b/test/data/DCP/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL">
+  <Id>urn:uuid:d76fdaaf-8316-42dc-a87e-1719ad6ca3ca</Id>
+  <AnnotationText>Created by libdcp</AnnotationText>
+  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
+  <Issuer>OpenDCP 0.0.25</Issuer>
+  <Creator>OpenDCP 0.0.25</Creator>
+  <AssetList>
+    <Asset>
+      <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
+      <AnnotationText>6affb8ee-0020-4dff-a53c-17652f6358ab</AnnotationText>
+      <Hash>eqEIVxSAbJL+SROmqrDHbr9sb+A=</Hash>
+      <Size>2024</Size>
+      <Type>text/xml</Type>
+      <OriginalFileName>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</OriginalFileName>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
+      <AnnotationText>5407b210-4441-4e97-8b16-8bdc7c12da54</AnnotationText>
+      <Hash>o3VmpdFsNUgF11oadcaGJ/IfO0M=</Hash>
+      <Size>40144</Size>
+      <Type>application/mxf</Type>
+      <OriginalFileName>video.mxf</OriginalFileName>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa</Id>
+      <AnnotationText>97f0f352-5b77-48ee-a558-9df37717f4fa</AnnotationText>
+      <Hash>l+XLgxe2fMZDgY+0QYzDfGhvTQM=</Hash>
+      <Size>161326</Size>
+      <Type>application/mxf</Type>
+      <OriginalFileName>audio.mxf</OriginalFileName>
+    </Asset>
+  </AssetList>
+</PackingList>
diff --git a/test/data/DCP/video.mxf b/test/data/DCP/video.mxf
new file mode 100644
index 00000000..f3e7588b
--- /dev/null
+++ b/test/data/DCP/video.mxf