summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-10-16 23:13:10 +0200
committerCarl Hetherington <cth@carlh.net>2023-10-17 12:44:04 +0200
commit06c02f781597a5679c9a2fcdc7a7c9f79f58f6f4 (patch)
treec8ce7dff80911b4513c4d5ff109689aecd03c638
parent460e2fb65c378256a8f8fb7f3249f746c5b1990e (diff)
Don't write MCA subdescriptors for channels that don't exist in the MXF (#2631).v1.8.86
This causes some test ID churn.
Diffstat
-rw-r--r--src/sound_asset_writer.cc8
-rw-r--r--test/data/DCP/ASSETMAP.xml56
-rw-r--r--test/data/DCP/VOLINDEX.xml4
-rw-r--r--test/data/DCP/audio.mxfbin0 -> 161326 bytes
-rw-r--r--test/data/DCP/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml49
-rw-r--r--test/data/DCP/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml (renamed from test/ref/DCP/dcp_test5/pkl_017b3de4-6dda-408d-b19b-6711354b0bc3.xml)6
-rw-r--r--test/data/DCP/video.mxfbin0 -> 40144 bytes
-rw-r--r--test/ref/DCP/dcp_test2/ASSETMAP.xml6
-rw-r--r--test/ref/DCP/dcp_test2/audio.mxfbin161326 -> 161326 bytes
-rw-r--r--test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml4
-rw-r--r--test/ref/DCP/dcp_test2/pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml (renamed from test/ref/DCP/dcp_test2/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml)6
-rw-r--r--test/ref/DCP/dcp_test5/ASSETMAP.xml6
-rw-r--r--test/ref/DCP/dcp_test5/audio.mxfbin161326 -> 161326 bytes
-rw-r--r--test/ref/DCP/dcp_test5/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml4
-rw-r--r--test/ref/DCP/dcp_test5/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml34
-rw-r--r--test/ref/DCP/encryption_test/ASSETMAP.xml6
-rw-r--r--test/ref/DCP/encryption_test/audio.mxfbin165454 -> 165454 bytes
-rw-r--r--test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml18
-rw-r--r--test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml (renamed from test/ref/DCP/encryption_test/pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml)20
19 files changed, 189 insertions, 38 deletions
diff --git a/src/sound_asset_writer.cc b/src/sound_asset_writer.cc
index 9ec93924..3ea2243b 100644
--- a/src/sound_asset_writer.cc
+++ b/src/sound_asset_writer.cc
@@ -211,6 +211,14 @@ LIBDCP_ENABLE_WARNINGS
std::sort(dcp_channels.begin(), dcp_channels.end());
dcp_channels.erase(std::unique(dcp_channels.begin(), dcp_channels.end()), dcp_channels.end());
+ /* Remove channels that aren't actually in this MXF at all */
+ dcp_channels.erase(
+ std::remove_if(dcp_channels.begin(), dcp_channels.end(), [this](dcp::Channel channel) {
+ return static_cast<int>(channel) >= _asset->channels();
+ }),
+ dcp_channels.end()
+ );
+
for (auto dcp_channel: dcp_channels) {
auto channel = new ASDCP::MXF::AudioChannelLabelSubDescriptor(asdcp_smpte_dict);
GenRandomValue (channel->MCALinkID);
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
Binary files differ
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/ref/DCP/dcp_test5/pkl_017b3de4-6dda-408d-b19b-6711354b0bc3.xml b/test/data/DCP/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml
index 9b388774..49fd579b 100644
--- a/test/ref/DCP/dcp_test5/pkl_017b3de4-6dda-408d-b19b-6711354b0bc3.xml
+++ b/test/data/DCP/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.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:017b3de4-6dda-408d-b19b-6711354b0bc3</Id>
+ <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>
@@ -9,7 +9,7 @@
<Asset>
<Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
<AnnotationText>6affb8ee-0020-4dff-a53c-17652f6358ab</AnnotationText>
- <Hash>kiv8PHo8XZc/lI2xk7qYghrP2SA=</Hash>
+ <Hash>eqEIVxSAbJL+SROmqrDHbr9sb+A=</Hash>
<Size>2024</Size>
<Type>text/xml</Type>
<OriginalFileName>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</OriginalFileName>
@@ -25,7 +25,7 @@
<Asset>
<Id>urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa</Id>
<AnnotationText>97f0f352-5b77-48ee-a558-9df37717f4fa</AnnotationText>
- <Hash>wLbXcpQtWt2IFMHIcibxwND667I=</Hash>
+ <Hash>l+XLgxe2fMZDgY+0QYzDfGhvTQM=</Hash>
<Size>161326</Size>
<Type>application/mxf</Type>
<OriginalFileName>audio.mxf</OriginalFileName>
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
Binary files differ
diff --git a/test/ref/DCP/dcp_test2/ASSETMAP.xml b/test/ref/DCP/dcp_test2/ASSETMAP.xml
index 68d9a5cb..b32d045c 100644
--- a/test/ref/DCP/dcp_test2/ASSETMAP.xml
+++ b/test/ref/DCP/dcp_test2/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:017b3de4-6dda-408d-b19b-6711354b0bc3</Id>
+ <Id>urn:uuid:d76fdaaf-8316-42dc-a87e-1719ad6ca3ca</Id>
<AnnotationText>Created by libdcp</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:d199d58b-5ef8-4d49-b270-07e590ccb280</Id>
+ <Id>urn:uuid:8577c7c0-be29-4eb5-a449-1e3870a42bbd</Id>
<PackingList>true</PackingList>
<ChunkList>
<Chunk>
- <Path>pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml</Path>
+ <Path>pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml</Path>
<VolumeIndex>1</VolumeIndex>
<Offset>0</Offset>
<Length>1380</Length>
diff --git a/test/ref/DCP/dcp_test2/audio.mxf b/test/ref/DCP/dcp_test2/audio.mxf
index 4416225c..e8bd446f 100644
--- a/test/ref/DCP/dcp_test2/audio.mxf
+++ b/test/ref/DCP/dcp_test2/audio.mxf
Binary files differ
diff --git a/test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
index d9eb222e..52a7779a 100644
--- a/test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
+++ b/test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
@@ -14,7 +14,7 @@
<RatingList/>
<ReelList>
<Reel>
- <Id>urn:uuid:3b198cbc-c1d2-4410-805c-397b6fea0297</Id>
+ <Id>urn:uuid:d98861e8-aefc-433d-9e96-1745e7ba039e</Id>
<AssetList>
<MainSound>
<Id>urn:uuid:fc843acc-1ad9-4808-b9ed-33f5319e047d</Id>
@@ -22,7 +22,7 @@
<IntrinsicDuration>24</IntrinsicDuration>
<EntryPoint>0</EntryPoint>
<Duration>24</Duration>
- <Hash>3PtaGoYcvBdq5WYiK0cmeDwm8d0=</Hash>
+ <Hash>NzWhEbTccUIh1sSXIbU+8POVui0=</Hash>
</MainSound>
<msp-cpl:MainStereoscopicPicture xmlns:msp-cpl="http://www.smpte-ra.org/schemas/429-10/2008/Main-Stereo-Picture-CPL">
<Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
diff --git a/test/ref/DCP/dcp_test2/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml b/test/ref/DCP/dcp_test2/pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml
index 44da5c43..061e8a6a 100644
--- a/test/ref/DCP/dcp_test2/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
+++ b/test/ref/DCP/dcp_test2/pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.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:d199d58b-5ef8-4d49-b270-07e590ccb280</Id>
+ <Id>urn:uuid:8577c7c0-be29-4eb5-a449-1e3870a42bbd</Id>
<AnnotationText>Created by libdcp</AnnotationText>
<IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
<Issuer>OpenDCP 0.0.25</Issuer>
@@ -9,7 +9,7 @@
<Asset>
<Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
<AnnotationText>6affb8ee-0020-4dff-a53c-17652f6358ab</AnnotationText>
- <Hash>6F7kAEYbNdv6gz6PG5JcMjGF8kU=</Hash>
+ <Hash>zaAcrAcv0oOzOa3etTP6xDfzQko=</Hash>
<Size>1686</Size>
<Type>text/xml</Type>
<OriginalFileName>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</OriginalFileName>
@@ -25,7 +25,7 @@
<Asset>
<Id>urn:uuid:fc843acc-1ad9-4808-b9ed-33f5319e047d</Id>
<AnnotationText>fc843acc-1ad9-4808-b9ed-33f5319e047d</AnnotationText>
- <Hash>3PtaGoYcvBdq5WYiK0cmeDwm8d0=</Hash>
+ <Hash>NzWhEbTccUIh1sSXIbU+8POVui0=</Hash>
<Size>161326</Size>
<Type>application/mxf</Type>
<OriginalFileName>audio.mxf</OriginalFileName>
diff --git a/test/ref/DCP/dcp_test5/ASSETMAP.xml b/test/ref/DCP/dcp_test5/ASSETMAP.xml
index 79a3091c..e5bee939 100644
--- a/test/ref/DCP/dcp_test5/ASSETMAP.xml
+++ b/test/ref/DCP/dcp_test5/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:4f26ba15-f1bc-450a-aaeb-8a4801ce11d5</Id>
+ <Id>urn:uuid:76aef948-ca63-4d4a-b707-27727c55d370</Id>
<AnnotationText>Created by libdcp</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:017b3de4-6dda-408d-b19b-6711354b0bc3</Id>
+ <Id>urn:uuid:d76fdaaf-8316-42dc-a87e-1719ad6ca3ca</Id>
<PackingList>true</PackingList>
<ChunkList>
<Chunk>
- <Path>pkl_017b3de4-6dda-408d-b19b-6711354b0bc3.xml</Path>
+ <Path>pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml</Path>
<VolumeIndex>1</VolumeIndex>
<Offset>0</Offset>
<Length>1380</Length>
diff --git a/test/ref/DCP/dcp_test5/audio.mxf b/test/ref/DCP/dcp_test5/audio.mxf
index 499ea47c..947865e1 100644
--- a/test/ref/DCP/dcp_test5/audio.mxf
+++ b/test/ref/DCP/dcp_test5/audio.mxf
Binary files differ
diff --git a/test/ref/DCP/dcp_test5/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/dcp_test5/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
index eb85a118..5fa3643b 100644
--- a/test/ref/DCP/dcp_test5/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
+++ b/test/ref/DCP/dcp_test5/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
@@ -14,7 +14,7 @@
<RatingList/>
<ReelList>
<Reel>
- <Id>urn:uuid:d199d58b-5ef8-4d49-b270-07e590ccb280</Id>
+ <Id>urn:uuid:8577c7c0-be29-4eb5-a449-1e3870a42bbd</Id>
<AssetList>
<MainPicture>
<Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
@@ -32,7 +32,7 @@
<IntrinsicDuration>24</IntrinsicDuration>
<EntryPoint>0</EntryPoint>
<Duration>24</Duration>
- <Hash>wLbXcpQtWt2IFMHIcibxwND667I=</Hash>
+ <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>
diff --git a/test/ref/DCP/dcp_test5/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml b/test/ref/DCP/dcp_test5/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml
new file mode 100644
index 00000000..49fd579b
--- /dev/null
+++ b/test/ref/DCP/dcp_test5/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/ref/DCP/encryption_test/ASSETMAP.xml b/test/ref/DCP/encryption_test/ASSETMAP.xml
index 902833dc..9abf60a6 100644
--- a/test/ref/DCP/encryption_test/ASSETMAP.xml
+++ b/test/ref/DCP/encryption_test/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:460be38d-d560-455c-ad57-b2e80ca9b228</Id>
+ <Id>urn:uuid:d060dec0-cb61-4ca0-8d12-39346c7ec9c5</Id>
<AnnotationText>Created by libdcp</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:93887017-5d6a-4ee5-b5f4-161b06281d0e</Id>
+ <Id>urn:uuid:5203f3d4-9d62-4062-8bf1-7a114eff99df</Id>
<PackingList>true</PackingList>
<ChunkList>
<Chunk>
- <Path>pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml</Path>
+ <Path>pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml</Path>
<VolumeIndex>1</VolumeIndex>
<Offset>0</Offset>
<Length>8902</Length>
diff --git a/test/ref/DCP/encryption_test/audio.mxf b/test/ref/DCP/encryption_test/audio.mxf
index 61839db4..a4f89ae9 100644
--- a/test/ref/DCP/encryption_test/audio.mxf
+++ b/test/ref/DCP/encryption_test/audio.mxf
Binary files differ
diff --git a/test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
index 73fad88f..e8e24467 100644
--- a/test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
+++ b/test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
@@ -14,7 +14,7 @@
<RatingList/>
<ReelList>
<Reel>
- <Id>urn:uuid:c1d35c2a-39c5-46b8-bbeb-7a1cdffff013</Id>
+ <Id>urn:uuid:09af6f47-8aab-4de5-950c-14e590320120</Id>
<AssetList>
<MainPicture>
<Id>urn:uuid:9a7fbb03-4078-4944-90b1-0d8a21c9d793</Id>
@@ -34,7 +34,7 @@
<EntryPoint>0</EntryPoint>
<Duration>24</Duration>
<KeyId>urn:uuid:7ab6c77b-6648-44b9-8549-a5290ada6238</KeyId>
- <Hash>lS+FKcwLD7cRjgZMQ+hvGg/yJIc=</Hash>
+ <Hash>3o02UpYqrl6w0NQbFvrB2tKxaIk=</Hash>
</MainSound>
</AssetList>
</Reel>
@@ -57,15 +57,15 @@
<dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <dsig:DigestValue>i2q8BhQwGZp0cROMkuiI4sE0e9w=</dsig:DigestValue>
+ <dsig:DigestValue>X3YkODMLyEJsAz5v3S/uT+xDD7c=</dsig:DigestValue>
</dsig:Reference>
</dsig:SignedInfo>
- <dsig:SignatureValue>xGQzQKVoTFElGV0kBwORWtYhTLCJKXDBV39XgZ1J/HRBcFiO4e58MSc+5Gi8mJ0W
-c+m8eB5Y6ti6ATFnPQTt9l/FdoqUgzHtPXMPMPU9sS7HSjY4Qew6iqpzX2Sb5A76
-k30dn4nHSXZ25WwU09gKg4pzCIv25loY2mwgqXiDXeLv2FTyexmM2jKP6og49Yc9
-skpg90alEYWXef99bErVVrXMzBc6QHh+cvWx+X2TRGjnerjxr5aCal8+BvdG6VMK
-9p4kOsMiQ8xBblquizC6rXXT96iV+Ov1wPuLNFCO3M60pApUamefCqzQ7wCEfsGg
-ZhNxhu99RxfV9l4HXNvV9g==</dsig:SignatureValue>
+ <dsig:SignatureValue>jH02vGxlTTi9T94KCIfMkafmdO0wluP9cvh+u5HyYoZo/D7O1Ki202t5uHRp0wcu
+OfBFuu1Hw3Ooy/VEa2l4l/UDfE7lI+D79e0VfA8HwFB+c21GF7Q2FRV5ddu9ODgz
+rk6kC5fZSLxc7cpK6jPNnT285O3nHfjk6MQ0fgGfNbvMefgeEWVKj8qcyFgN6H4e
+wr1omcjbdw/HVQaOW84//pBRSRdMJGe1u2iUE2RwxBLzP4BepzkMv9Asm6uDo1YG
+X1d60g2aCUdxAg9fjyTaOss1nRp1YdPlb3SHUhKXgTT/eAPkmmr7bs3jJtp2BN9U
+4Izz2GR/3Uyf0NP20mZgNQ==</dsig:SignatureValue>
<dsig:KeyInfo>
<dsig:X509Data>
<dsig:X509IssuerSerial>
diff --git a/test/ref/DCP/encryption_test/pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml b/test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml
index db5b78f2..4d49b259 100644
--- a/test/ref/DCP/encryption_test/pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml
+++ b/test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.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:93887017-5d6a-4ee5-b5f4-161b06281d0e</Id>
+ <Id>urn:uuid:5203f3d4-9d62-4062-8bf1-7a114eff99df</Id>
<AnnotationText>Created by libdcp</AnnotationText>
<IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
<Issuer>OpenDCP 0.0.25</Issuer>
@@ -9,7 +9,7 @@
<Asset>
<Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
<AnnotationText>6affb8ee-0020-4dff-a53c-17652f6358ab</AnnotationText>
- <Hash>ocIgRDFtEn7QPxwcqXYVpSrTPpI=</Hash>
+ <Hash>Zd9zaFAGx/4W2B3vSZkAqTzcDZ0=</Hash>
<Size>9226</Size>
<Type>text/xml</Type>
<OriginalFileName>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</OriginalFileName>
@@ -25,7 +25,7 @@
<Asset>
<Id>urn:uuid:ce300880-a425-40a6-adac-eb1e3f5643fc</Id>
<AnnotationText>ce300880-a425-40a6-adac-eb1e3f5643fc</AnnotationText>
- <Hash>lS+FKcwLD7cRjgZMQ+hvGg/yJIc=</Hash>
+ <Hash>3o02UpYqrl6w0NQbFvrB2tKxaIk=</Hash>
<Size>165454</Size>
<Type>application/mxf</Type>
<OriginalFileName>audio.mxf</OriginalFileName>
@@ -49,15 +49,15 @@
<dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <dsig:DigestValue>G6rpYhOo/0ZdBo+SI3UzyPQA/F0=</dsig:DigestValue>
+ <dsig:DigestValue>0F1ZXfoRDPIQHlRG0MC1uXkahG8=</dsig:DigestValue>
</dsig:Reference>
</dsig:SignedInfo>
- <dsig:SignatureValue>tdapJHKPEmEa552oOg9s3/Q4TcnzIiNfd3U+xiSG5XGl+7K0n6JKbpNVgm4KpE0l
-a7bVsu4Yp0ftCrcjxxczZ/puS7nVC/zcfk63miZcJKdXem0xt0AZJHEguwQq74Tc
-48Efe1/MtIBCOtQErh2kcDVwXOUo6Nz0yW1g5PRQ5u9KlqQ67RLqDWRdX1OkWIUZ
-Z2Iz2nSnTP4GDDHs5pX6xxZKNlgZIa5iYMBp97X1DGlGaQ2o/sbcUysE4g4oO+iU
-cfRdkI68vj53hHWApxVGoAPAl4t8B6kMbLQAp1w4R/4ruLR9FKTffqRlUjOXtyiT
-pQVNxwCU50/opyfv8v2v6w==</dsig:SignatureValue>
+ <dsig:SignatureValue>u98MLscN/Fn3YxGFMw6kP7fIWUj05FPxQvIYvsIpP68UP3FX9rdP6nh3Olyv194d
+A1fQJu4ZamTcYN2O2E5vdGjxxHlPNXfFPckWc9Sy1i3V8u+EFdOggjMY4snvPot6
+kMyzAICuKzTJs4l+O/BzJAJSFSxrEtBCYEFxrtyKntDxSUE7ePSqPwcim6+5BzDO
+QOsIp3wjJHlp7u4QqU3knIiaM7SibIXqtIBF7TOrChWZjFImKePNib9/DXvnE2WL
+Y+5wJjGhImQR+2U2DDpSCLkl0kVgDrYfKcNg4lXUDZGEKo0Yqz0+1Rszz/DqsC+J
+6mYxqMMvRXeh9pViSpgKaA==</dsig:SignatureValue>
<dsig:KeyInfo>
<dsig:X509Data>
<dsig:X509IssuerSerial>
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-05 20:32:14 +0000