summaryrefslogtreecommitdiff
path: root/test/ref/DCP/dcp_test1
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-03-26 00:09:15 +0100
committerCarl Hetherington <cth@carlh.net>2021-03-26 00:09:15 +0100
commitb9c5e3f74550917676e14324791d6ba4d0c07cac (patch)
tree4e3264a68c365af195f682b548186f6c973246b7 /test/ref/DCP/dcp_test1
parentc7208194515e93f85441c76d78d11a47d79b36e1 (diff)
Write MCA tags based on the specified sound field.
I had previously assumed that one should write MCA information into the sound MXF based on what channels actually contain sound rather than silence. However a previous example of a stereo DCP gives a verification error in EasyDCP (see DoM bug #1935) which is solved by adding MCA tags for each channel in the specified sound field (e.g. at least 6 tags for a file which is marked as 5.1) even if the audio is really stereo. This commit removes the "active channels" stuff and makes sure that if we say a file is 5.1 we write at least 6 MCA tags (and similarly for 7.1).
Diffstat (limited to 'test/ref/DCP/dcp_test1')
-rw-r--r--test/ref/DCP/dcp_test1/ASSETMAP.xml8
-rw-r--r--test/ref/DCP/dcp_test1/audio.mxfbin881326 -> 881326 bytes
-rw-r--r--test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml58
-rw-r--r--test/ref/DCP/dcp_test1/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml (renamed from test/ref/DCP/dcp_test1/pkl_2b9b857f-ab4a-440e-a313-1ace0f1cfc95.xml)8
4 files changed, 62 insertions, 12 deletions
diff --git a/test/ref/DCP/dcp_test1/ASSETMAP.xml b/test/ref/DCP/dcp_test1/ASSETMAP.xml
index 1e5c909b..88c77c37 100644
--- a/test/ref/DCP/dcp_test1/ASSETMAP.xml
+++ b/test/ref/DCP/dcp_test1/ASSETMAP.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM">
- <Id>urn:uuid:07e9f5a0-83ab-4791-8c6b-7df5d11f76f9</Id>
+ <Id>urn:uuid:5d51e8a1-b2a5-4da6-9b66-4615c3609440</Id>
<AnnotationText>A Test DCP</AnnotationText>
<Creator>OpenDCP 0.0.25</Creator>
<VolumeCount>1</VolumeCount>
@@ -8,11 +8,11 @@
<Issuer>OpenDCP 0.0.25</Issuer>
<AssetList>
<Asset>
- <Id>urn:uuid:2b9b857f-ab4a-440e-a313-1ace0f1cfc95</Id>
+ <Id>urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f</Id>
<PackingList>true</PackingList>
<ChunkList>
<Chunk>
- <Path>pkl_2b9b857f-ab4a-440e-a313-1ace0f1cfc95.xml</Path>
+ <Path>pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml</Path>
<VolumeIndex>1</VolumeIndex>
<Offset>0</Offset>
<Length>1179</Length>
@@ -26,7 +26,7 @@
<Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path>
<VolumeIndex>1</VolumeIndex>
<Offset>0</Offset>
- <Length>5082</Length>
+ <Length>8762</Length>
</Chunk>
</ChunkList>
</Asset>
diff --git a/test/ref/DCP/dcp_test1/audio.mxf b/test/ref/DCP/dcp_test1/audio.mxf
index 0b5a4459..068d6bfa 100644
--- a/test/ref/DCP/dcp_test1/audio.mxf
+++ b/test/ref/DCP/dcp_test1/audio.mxf
Binary files differ
diff --git a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
index fed09ab1..36e2ff51 100644
--- a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
+++ b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
@@ -14,10 +14,10 @@
<RatingList/>
<ReelList>
<Reel>
- <Id>urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d</Id>
+ <Id>urn:uuid:7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c</Id>
<AssetList>
<MainMarkers>
- <Id>urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c</Id>
+ <Id>urn:uuid:793170e7-e913-404b-8942-1c7f2e5cf012</Id>
<AnnotationText></AnnotationText>
<EditRate>24 1</EditRate>
<IntrinsicDuration>24</IntrinsicDuration>
@@ -52,10 +52,10 @@
<IntrinsicDuration>24</IntrinsicDuration>
<EntryPoint>0</EntryPoint>
<Duration>24</Duration>
- <Hash>qtXbkcwhUj/yqquVLmV+wbzbxQ8=</Hash>
+ <Hash>WU0/u1wM17y7Kriq06+65/ViX1o=</Hash>
</MainSound>
<meta:CompositionMetadataAsset xmlns:meta="http://www.smpte-ra.org/schemas/429-16/2014/CPL-Metadata">
- <Id>urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430</Id>
+ <Id>urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff</Id>
<EditRate>24 1</EditRate>
<IntrinsicDuration>24</IntrinsicDuration>
<meta:FullContentTitleText/>
@@ -100,6 +100,56 @@
<r1:RFC5646SpokenLanguage>en-US</r1:RFC5646SpokenLanguage>
<r1:SoundfieldGroupLinkID>urn:uuid:8e293965-f8ad-48c6-971d-261b01f65cdb</r1:SoundfieldGroupLinkID>
</r0:AudioChannelLabelSubDescriptor>
+ <r0:AudioChannelLabelSubDescriptor>
+ <r1:InstanceID>urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c</r1:InstanceID>
+ <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020102.00000000</r1:MCALabelDictionaryID>
+ <r1:MCALinkID>urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d</r1:MCALinkID>
+ <r1:MCATagSymbol>chR</r1:MCATagSymbol>
+ <r1:MCATagName>Right</r1:MCATagName>
+ <r1:MCAChannelID>2</r1:MCAChannelID>
+ <r1:RFC5646SpokenLanguage>en-US</r1:RFC5646SpokenLanguage>
+ <r1:SoundfieldGroupLinkID>urn:uuid:8e293965-f8ad-48c6-971d-261b01f65cdb</r1:SoundfieldGroupLinkID>
+ </r0:AudioChannelLabelSubDescriptor>
+ <r0:AudioChannelLabelSubDescriptor>
+ <r1:InstanceID>urn:uuid:2b9b857f-ab4a-440e-a313-1ace0f1cfc95</r1:InstanceID>
+ <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020103.00000000</r1:MCALabelDictionaryID>
+ <r1:MCALinkID>urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430</r1:MCALinkID>
+ <r1:MCATagSymbol>chC</r1:MCATagSymbol>
+ <r1:MCATagName>Center</r1:MCATagName>
+ <r1:MCAChannelID>3</r1:MCAChannelID>
+ <r1:RFC5646SpokenLanguage>en-US</r1:RFC5646SpokenLanguage>
+ <r1:SoundfieldGroupLinkID>urn:uuid:8e293965-f8ad-48c6-971d-261b01f65cdb</r1:SoundfieldGroupLinkID>
+ </r0:AudioChannelLabelSubDescriptor>
+ <r0:AudioChannelLabelSubDescriptor>
+ <r1:InstanceID>urn:uuid:9780965c-1d68-4829-b2cf-9666b6b91bd9</r1:InstanceID>
+ <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020104.00000000</r1:MCALabelDictionaryID>
+ <r1:MCALinkID>urn:uuid:07e9f5a0-83ab-4791-8c6b-7df5d11f76f9</r1:MCALinkID>
+ <r1:MCATagSymbol>chLFE</r1:MCATagSymbol>
+ <r1:MCATagName>LFE</r1:MCATagName>
+ <r1:MCAChannelID>4</r1:MCAChannelID>
+ <r1:RFC5646SpokenLanguage>en-US</r1:RFC5646SpokenLanguage>
+ <r1:SoundfieldGroupLinkID>urn:uuid:8e293965-f8ad-48c6-971d-261b01f65cdb</r1:SoundfieldGroupLinkID>
+ </r0:AudioChannelLabelSubDescriptor>
+ <r0:AudioChannelLabelSubDescriptor>
+ <r1:InstanceID>urn:uuid:18a0931c-9ecf-49cc-b851-8f1c6e0849bf</r1:InstanceID>
+ <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020105.00000000</r1:MCALabelDictionaryID>
+ <r1:MCALinkID>urn:uuid:3cf6c3a1-0b08-4033-96b5-1eefaf505371</r1:MCALinkID>
+ <r1:MCATagSymbol>chLs</r1:MCATagSymbol>
+ <r1:MCATagName>Left Surround</r1:MCATagName>
+ <r1:MCAChannelID>5</r1:MCAChannelID>
+ <r1:RFC5646SpokenLanguage>en-US</r1:RFC5646SpokenLanguage>
+ <r1:SoundfieldGroupLinkID>urn:uuid:8e293965-f8ad-48c6-971d-261b01f65cdb</r1:SoundfieldGroupLinkID>
+ </r0:AudioChannelLabelSubDescriptor>
+ <r0:AudioChannelLabelSubDescriptor>
+ <r1:InstanceID>urn:uuid:b6a34428-b4a5-4edf-bd3f-cf57be31cd2f</r1:InstanceID>
+ <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020106.00000000</r1:MCALabelDictionaryID>
+ <r1:MCALinkID>urn:uuid:0b93e03a-e6c1-4ad1-9a98-223a62c7e37f</r1:MCALinkID>
+ <r1:MCATagSymbol>chRs</r1:MCATagSymbol>
+ <r1:MCATagName>Right Surround</r1:MCATagName>
+ <r1:MCAChannelID>6</r1:MCAChannelID>
+ <r1:RFC5646SpokenLanguage>en-US</r1:RFC5646SpokenLanguage>
+ <r1:SoundfieldGroupLinkID>urn:uuid:8e293965-f8ad-48c6-971d-261b01f65cdb</r1:SoundfieldGroupLinkID>
+ </r0:AudioChannelLabelSubDescriptor>
</mca:MCASubDescriptors>
</meta:CompositionMetadataAsset>
</AssetList>
diff --git a/test/ref/DCP/dcp_test1/pkl_2b9b857f-ab4a-440e-a313-1ace0f1cfc95.xml b/test/ref/DCP/dcp_test1/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml
index e2a28329..c73f4a1d 100644
--- a/test/ref/DCP/dcp_test1/pkl_2b9b857f-ab4a-440e-a313-1ace0f1cfc95.xml
+++ b/test/ref/DCP/dcp_test1/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL">
- <Id>urn:uuid:2b9b857f-ab4a-440e-a313-1ace0f1cfc95</Id>
+ <Id>urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f</Id>
<AnnotationText>A Test DCP</AnnotationText>
<IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
<Issuer>OpenDCP 0.0.25</Issuer>
@@ -9,8 +9,8 @@
<Asset>
<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
<AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
- <Hash>X3bMCBdXEOYEpYmsConNWrWUAGs=</Hash>
- <Size>5082</Size>
+ <Hash>SEEi70vx1WQs67bmu2zKvzIkXvY=</Hash>
+ <Size>8762</Size>
<Type>text/xml</Type>
</Asset>
<Asset>
@@ -23,7 +23,7 @@
<Asset>
<Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id>
<AnnotationText>9482e87d-292d-4e0e-a98d-c61822b60fe9</AnnotationText>
- <Hash>qtXbkcwhUj/yqquVLmV+wbzbxQ8=</Hash>
+ <Hash>WU0/u1wM17y7Kriq06+65/ViX1o=</Hash>
<Size>881326</Size>
<Type>application/mxf</Type>
</Asset>
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-22 20:27:52 +0000