summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-09-09 22:41:52 +0200
committerCarl Hetherington <cth@carlh.net>2020-09-09 22:41:52 +0200
commitf77a03cc3ec0c5f917e0a2b6cf7599d035b34cff (patch)
tree04996a15949d0bf802dc0d55198945b5a41b9d7b
parent184bdd25573eaf398aac683efb12c0d2f4e676f7 (diff)
Use the <Id> read in when the Reel was created from XML (if appropriate)
when writing it out again, rather than creating a new one each time. Also there is the associated test churn here from removing a call to make_uuid().
Diffstat
-rw-r--r--src/reel.cc2
-rw-r--r--test/ref/DCP/dcp_test1/ASSETMAP.xml6
-rw-r--r--test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml2
-rw-r--r--test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml (renamed from test/ref/DCP/dcp_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml)4
-rw-r--r--test/ref/DCP/dcp_test2/ASSETMAP.xml6
-rw-r--r--test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml2
-rw-r--r--test/ref/DCP/dcp_test2/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml (renamed from test/ref/DCP/dcp_test2/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml)4
-rw-r--r--test/ref/DCP/dcp_test5/ASSETMAP.xml6
-rw-r--r--test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml2
-rw-r--r--test/ref/DCP/dcp_test5/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml (renamed from test/ref/DCP/dcp_test5/pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml)4
-rw-r--r--test/ref/DCP/dcp_test7/ASSETMAP6
-rw-r--r--test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml2
-rw-r--r--test/ref/DCP/dcp_test7/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml (renamed from test/ref/DCP/dcp_test7/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml)4
-rw-r--r--test/ref/DCP/encryption_test/ASSETMAP.xml6
-rw-r--r--test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml16
-rw-r--r--test/ref/DCP/encryption_test/pkl_93182bd2-b1e8-41a3-b5c8-6e6564273bff.xml (renamed from test/ref/DCP/encryption_test/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml)18
-rw-r--r--test/ref/write_interop_subtitle_test3/ASSETMAP6
-rw-r--r--test/ref/write_interop_subtitle_test3/cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml (renamed from test/ref/write_interop_subtitle_test3/cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml)8
-rw-r--r--test/ref/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png (renamed from test/ref/write_interop_subtitle_test3/ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png)bin44935 -> 44935 bytes
l---------test/ref/write_interop_subtitle_test3/pkl.xml2
-rw-r--r--test/ref/write_interop_subtitle_test3/pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml (renamed from test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml)4
-rw-r--r--test/verify_test.cc10
-rw-r--r--test/write_subtitle_test.cc2
23 files changed, 61 insertions, 61 deletions
diff --git a/src/reel.cc b/src/reel.cc
index 036147d6..453a3163 100644
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -119,7 +119,7 @@ void
Reel::write_to_cpl (xmlpp::Element* node, Standard standard) const
{
xmlpp::Element* reel = node->add_child ("Reel");
- reel->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid());
+ reel->add_child("Id")->add_child_text("urn:uuid:" + _id);
xmlpp::Element* asset_list = reel->add_child ("AssetList");
if (_main_markers) {
diff --git a/test/ref/DCP/dcp_test1/ASSETMAP.xml b/test/ref/DCP/dcp_test1/ASSETMAP.xml
index b0ad60dc..401c6c6d 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:74e205d0-d145-42d2-8c49-7b55d058ca55</Id>
+ <Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</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:ae8a9818-872a-4f86-8493-11dfdea03e09</Id>
+ <Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</Id>
<PackingList>true</PackingList>
<ChunkList>
<Chunk>
- <Path>pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml</Path>
+ <Path>pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml</Path>
<VolumeIndex>1</VolumeIndex>
<Offset>0</Offset>
<Length>1186</Length>
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 f7134807..682ae510 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,7 +14,7 @@
<RatingList/>
<ReelList>
<Reel>
- <Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</Id>
+ <Id>urn:uuid:8e293965-f8ad-48c6-971d-261b01f65cdb</Id>
<AssetList>
<MainPicture>
<Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
diff --git a/test/ref/DCP/dcp_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml b/test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml
index 8b24a133..105a7110 100644
--- a/test/ref/DCP/dcp_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml
+++ b/test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.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:ae8a9818-872a-4f86-8493-11dfdea03e09</Id>
+ <Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</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:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
<AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
- <Hash>Cl6gCndMaVEwx+b353yT+AyOKJw=</Hash>
+ <Hash>xU8Fk6atIPk9mlT9F1n9s+FgF8c=</Hash>
<Size>1585</Size>
<Type>text/xml</Type>
</Asset>
diff --git a/test/ref/DCP/dcp_test2/ASSETMAP.xml b/test/ref/DCP/dcp_test2/ASSETMAP.xml
index 7fa49616..bbe4f7eb 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:48db27c3-4964-46a2-8b02-3e5570efb42d</Id>
+ <Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</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:74e205d0-d145-42d2-8c49-7b55d058ca55</Id>
+ <Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id>
<PackingList>true</PackingList>
<ChunkList>
<Chunk>
- <Path>pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml</Path>
+ <Path>pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml</Path>
<VolumeIndex>1</VolumeIndex>
<Offset>0</Offset>
<Length>1186</Length>
diff --git a/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
index 61922e17..aea8304a 100644
--- a/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
+++ b/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
@@ -14,7 +14,7 @@
<RatingList/>
<ReelList>
<Reel>
- <Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id>
+ <Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</Id>
<AssetList>
<MainSound>
<Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id>
diff --git a/test/ref/DCP/dcp_test2/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml b/test/ref/DCP/dcp_test2/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml
index 6708f741..00206f96 100644
--- a/test/ref/DCP/dcp_test2/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml
+++ b/test/ref/DCP/dcp_test2/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.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:74e205d0-d145-42d2-8c49-7b55d058ca55</Id>
+ <Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</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:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
<AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
- <Hash>pqdZpLFIn6kcClkACI9VLGCzNgk=</Hash>
+ <Hash>hBXFu2pGlUzKmLLNe6LLkqIOnoA=</Hash>
<Size>1770</Size>
<Type>text/xml</Type>
</Asset>
diff --git a/test/ref/DCP/dcp_test5/ASSETMAP.xml b/test/ref/DCP/dcp_test5/ASSETMAP.xml
index a5be569a..f0391eb3 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:cd49971e-bf4c-4594-8474-54ebef09a40c</Id>
+ <Id>urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d</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:48db27c3-4964-46a2-8b02-3e5570efb42d</Id>
+ <Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</Id>
<PackingList>true</PackingList>
<ChunkList>
<Chunk>
- <Path>pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml</Path>
+ <Path>pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml</Path>
<VolumeIndex>1</VolumeIndex>
<Offset>0</Offset>
<Length>1186</Length>
diff --git a/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
index 4eafc4c2..345ae932 100644
--- a/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
+++ b/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
@@ -14,7 +14,7 @@
<RatingList/>
<ReelList>
<Reel>
- <Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</Id>
+ <Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id>
<AssetList>
<MainPicture>
<Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
diff --git a/test/ref/DCP/dcp_test5/pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml b/test/ref/DCP/dcp_test5/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml
index dd0f69eb..b7696dfb 100644
--- a/test/ref/DCP/dcp_test5/pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml
+++ b/test/ref/DCP/dcp_test5/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.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:48db27c3-4964-46a2-8b02-3e5570efb42d</Id>
+ <Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</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:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
<AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
- <Hash>yymWSY7jL4TWqI1Sy/Q2oUK1GX8=</Hash>
+ <Hash>e3Gy1PLmR1iRdzDPzy3jqxZ/yLk=</Hash>
<Size>2152</Size>
<Type>text/xml</Type>
</Asset>
diff --git a/test/ref/DCP/dcp_test7/ASSETMAP b/test/ref/DCP/dcp_test7/ASSETMAP
index 92ef4e38..4a2bb306 100644
--- a/test/ref/DCP/dcp_test7/ASSETMAP
+++ b/test/ref/DCP/dcp_test7/ASSETMAP
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<AssetMap xmlns="http://www.digicine.com/PROTO-ASDCP-AM-20040311#">
- <Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</Id>
+ <Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id>
<AnnotationText>Created by libdcp</AnnotationText>
<VolumeCount>1</VolumeCount>
<IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
@@ -8,11 +8,11 @@
<Creator>OpenDCP 0.0.25</Creator>
<AssetList>
<Asset>
- <Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id>
+ <Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</Id>
<PackingList>true</PackingList>
<ChunkList>
<Chunk>
- <Path>pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml</Path>
+ <Path>pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml</Path>
<VolumeIndex>1</VolumeIndex>
<Offset>0</Offset>
<Length>1253</Length>
diff --git a/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
index 24a8419c..4cce722e 100644
--- a/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
+++ b/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
@@ -14,7 +14,7 @@
<RatingList/>
<ReelList>
<Reel>
- <Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</Id>
+ <Id>urn:uuid:8e293965-f8ad-48c6-971d-261b01f65cdb</Id>
<AssetList>
<MainPicture>
<Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
diff --git a/test/ref/DCP/dcp_test7/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml b/test/ref/DCP/dcp_test7/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml
index 70c4fb56..f526f380 100644
--- a/test/ref/DCP/dcp_test7/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml
+++ b/test/ref/DCP/dcp_test7/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#">
- <Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id>
+ <Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</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:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
<AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
- <Hash>W4fAVf4nVZNfwWd25Vu1WtsFnUQ=</Hash>
+ <Hash>6pwcsW6Ysnzp0U5khSsM4vYe5bM=</Hash>
<Size>1587</Size>
<Type>text/xml;asdcpKind=CPL</Type>
</Asset>
diff --git a/test/ref/DCP/encryption_test/ASSETMAP.xml b/test/ref/DCP/encryption_test/ASSETMAP.xml
index 3f189256..3eb1900c 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:5d51e8a1-b2a5-4da6-9b66-4615c3609440</Id>
+ <Id>urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f</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:6af1e0c1-c441-47f8-a502-3efd46b1fa4f</Id>
+ <Id>urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff</Id>
<PackingList>true</PackingList>
<ChunkList>
<Chunk>
- <Path>pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml</Path>
+ <Path>pkl_93182bd2-b1e8-41a3-b5c8-6e6564273bff.xml</Path>
<VolumeIndex>1</VolumeIndex>
<Offset>0</Offset>
<Length>8708</Length>
diff --git a/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
index a2dc3bf4..6f77e1d6 100644
--- a/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
+++ b/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
@@ -14,7 +14,7 @@
<RatingList/>
<ReelList>
<Reel>
- <Id>urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff</Id>
+ <Id>urn:uuid:793170e7-e913-404b-8942-1c7f2e5cf012</Id>
<AssetList>
<MainPicture>
<Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
@@ -59,15 +59,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>IANIEQpHSdKYpetv7vU8c9NL55g=</dsig:DigestValue>
+ <dsig:DigestValue>vUKHL/1VIgu6pX+GLoHag/nZXqQ=</dsig:DigestValue>
</dsig:Reference>
</dsig:SignedInfo>
- <dsig:SignatureValue>elcV7C8ITQPME2EnZCld1/NPFi5KXzSEWGDEchEfHryc6kLx2ZY1yl/uylaHgY0R
-Z37ida9b0wPySJzr5vbTRerIHF/S2asXtGC1kgo5MWtXgATUtUe031HJ+TJPi9bj
-SD0u1V+PciElYwPRHID27kpLVgdSoq6cNoYG2w4yNvtnyF5r+n+0IiCYNMlkVqGW
-gX2Lfa/Oy8bJbioOo5yHt+6sFSPAp7GJdTEtzOEiKAkaLpymAB7N3L3gW2qS6OnL
-2KspdXdR3WKqPEprf3A0OtWTjbfsuvsyleCl/gw4O2dMRFbc1R0OutsWVw1h8PXl
-UtAYFxwdlY7ile2ZCelQMA==</dsig:SignatureValue>
+ <dsig:SignatureValue>DWmEtKozmtao3qdXOU7kQze+SIRh8gml2OrliFT+8U9xjBbUdLXWBPgTQuuVPI8u
+iHxVoc7cLKxOGuB7EXMl1EWwsm62y+I6/NEWfjV8EKkgHuhGE0TV/++5E0i/Dg/q
+Eq1whVbQ/EorYUea0/mW2UAgovKiz0MwQgyQb6Jgpy0O3PuNDrSlWeo3DUTFQiF8
+saaliNHSNXC8DEoNDnfSzAesL9jt6W4IEDPQp0rean7u4/0EhISlFMvea2YFiuCo
++/IZtb2tWtHMLx4mU7g1eLeGcNc2fWSygAs+pdPemoFX82r7Y9YTepZAbwhrvhFk
+kkgV/08P+RZE3ftF1pQ00g==</dsig:SignatureValue>
<dsig:KeyInfo>
<dsig:X509Data>
<dsig:X509IssuerSerial>
diff --git a/test/ref/DCP/encryption_test/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml b/test/ref/DCP/encryption_test/pkl_93182bd2-b1e8-41a3-b5c8-6e6564273bff.xml
index fdfb170d..5affb3a4 100644
--- a/test/ref/DCP/encryption_test/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml
+++ b/test/ref/DCP/encryption_test/pkl_93182bd2-b1e8-41a3-b5c8-6e6564273bff.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:6af1e0c1-c441-47f8-a502-3efd46b1fa4f</Id>
+ <Id>urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff</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:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
<AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
- <Hash>dhoWJ3yykLSeAOQVOUNvMxsiljk=</Hash>
+ <Hash>9sunXON1YDsep+RAReRz3aLnadY=</Hash>
<Size>9310</Size>
<Type>text/xml</Type>
</Asset>
@@ -46,15 +46,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>92Er8kJ8u9u76Fb1EUNVyeblJd0=</dsig:DigestValue>
+ <dsig:DigestValue>YZJkjLwee6xcN8jEcZcyrZ/ZSGo=</dsig:DigestValue>
</dsig:Reference>
</dsig:SignedInfo>
- <dsig:SignatureValue>SdxywkzTQtRWscRC9dmEoepc2dJ9cIi/GShodKNcRAYJBpm+zqpMCJ3wDT3q+pvT
-igG/hnkMRKQlAjK1I/VBEUGfEisl8QAerme8ff+GzY9vYlPoTyGQnqrNY+JBeir7
-r46JELWAxiRa+bMM/Dw3PLrRtQ/0EtZIcPNrJ6K+VeYHjV9KaaFXB740bJ1emVtY
-BqaAyXG2gk/4v1TFf19IBNH0cwu/nwJ7Cg6Xp2dKkRqtmOITYdxV9Ro/FxPs0M4Q
-vuwoOUJQxtgs4WgvGwHAvzTkyr6E5tX7z0uh5YEbH5/IX8l1fOvMi3LHK0E77d5k
-8IdST9nHTtvpHrJgsDUI4A==</dsig:SignatureValue>
+ <dsig:SignatureValue>NQ0UGAcWKlLWt1I0Baxt1lKxc0AmfLWsJ4Hnfn2FgZ0x07gR/GwP552ZfgQDG7Cx
+/wRey1Cg7AAd6I6keV9kKyB1sPrDND6DQaXfS3ymmcaOtCcGa2Wt3hybwVWN67Uw
+EQFHAOwC5iwgTLLpW43OtBUY65qcXyVMuOgmENjiaocu+D9lTV5nraxNbFvFlBel
+0AazpjWkevFK2v32SxzINBy2yOpqEpz1vax2hYSPMGWj5anf2Bckd3HDzl9KAHYl
+WZKO56Ad49/8QMFGcbOlpAA74EgOW9jidd0HIgkyDl7tE8bFfzOfNeo9n6AcO5wF
+79YV+reJM/J0381W8OaN+Q==</dsig:SignatureValue>
<dsig:KeyInfo>
<dsig:X509Data>
<dsig:X509IssuerSerial>
diff --git a/test/ref/write_interop_subtitle_test3/ASSETMAP b/test/ref/write_interop_subtitle_test3/ASSETMAP
index 9c8e07c5..dfcc1bc9 100644
--- a/test/ref/write_interop_subtitle_test3/ASSETMAP
+++ b/test/ref/write_interop_subtitle_test3/ASSETMAP
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<AssetMap xmlns="http://www.digicine.com/PROTO-ASDCP-AM-20040311#">
- <Id>urn:uuid:47a8e83e-fd5f-445d-a1bc-9f59c5289c34</Id>
+ <Id>urn:uuid:e94b8a0d-27f7-408a-af16-78d3df419a91</Id>
<AnnotationText>Created by libdcp</AnnotationText>
<VolumeCount>1</VolumeCount>
<IssueDate>2018-09-02T04:45:18+00:00</IssueDate>
@@ -8,11 +8,11 @@
<Creator>libdcp</Creator>
<AssetList>
<Asset>
- <Id>urn:uuid:e94b8a0d-27f7-408a-af16-78d3df419a91</Id>
+ <Id>urn:uuid:6a9e31a6-50a4-4ecb-8683-fa667848470a</Id>
<PackingList>true</PackingList>
<ChunkList>
<Chunk>
- <Path>pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml</Path>
+ <Path>pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml</Path>
<VolumeIndex>1</VolumeIndex>
<Offset>0</Offset>
<Length>1114</Length>
diff --git a/test/ref/write_interop_subtitle_test3/cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml b/test/ref/write_interop_subtitle_test3/cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml
index 0f2e8d70..0277187c 100644
--- a/test/ref/write_interop_subtitle_test3/cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml
+++ b/test/ref/write_interop_subtitle_test3/cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<CompositionPlaylist xmlns="http://www.digicine.com/PROTO-ASDCP-CPL-20040511#">
- <Id>urn:uuid:f28b567b-3b9a-417a-aee4-6fc1a2c6a3af</Id>
+ <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
<AnnotationText>Created by libdcp</AnnotationText>
<IssueDate>2018-09-02T04:45:18+00:00</IssueDate>
<Issuer>libdcp</Issuer>
@@ -8,13 +8,13 @@
<ContentTitleText>My film</ContentTitleText>
<ContentKind>feature</ContentKind>
<ContentVersion>
- <Id>urn:uuid:9f134b47-ab8d-4c3c-adbf-f494b1544283</Id>
+ <Id>urn:uuid:e98d059d-645f-4343-a30f-edc61d58b8e0</Id>
<LabelText>foo</LabelText>
</ContentVersion>
<RatingList/>
<ReelList>
<Reel>
- <Id>urn:uuid:ab16cd50-686f-4015-9498-4a142ecb0696</Id>
+ <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
<AssetList>
<MainSubtitle>
<Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>
@@ -23,7 +23,7 @@
<IntrinsicDuration>6046</IntrinsicDuration>
<EntryPoint>0</EntryPoint>
<Duration>6046</Duration>
- <Hash>rl+eBdjvZ0xaaaABGCpf6cm9G/Q=</Hash>
+ <Hash>cVnFjMLTQnSIAlIzJpNB/p7B230=</Hash>
</MainSubtitle>
</AssetList>
</Reel>
diff --git a/test/ref/write_interop_subtitle_test3/ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png b/test/ref/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png
index 89b53cf2..89b53cf2 100644
--- a/test/ref/write_interop_subtitle_test3/ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png
+++ b/test/ref/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png
Binary files differ
diff --git a/test/ref/write_interop_subtitle_test3/pkl.xml b/test/ref/write_interop_subtitle_test3/pkl.xml
index 3f38ee57..23d28034 120000
--- a/test/ref/write_interop_subtitle_test3/pkl.xml
+++ b/test/ref/write_interop_subtitle_test3/pkl.xml
@@ -1 +1 @@
-pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml \ No newline at end of file
+pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml \ No newline at end of file
diff --git a/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml b/test/ref/write_interop_subtitle_test3/pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml
index 368c9f24..5e721188 100644
--- a/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml
+++ b/test/ref/write_interop_subtitle_test3/pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#">
- <Id>urn:uuid:e94b8a0d-27f7-408a-af16-78d3df419a91</Id>
+ <Id>urn:uuid:6a9e31a6-50a4-4ecb-8683-fa667848470a</Id>
<AnnotationText>Created by libdcp</AnnotationText>
<IssueDate>2018-09-02T04:45:18+00:00</IssueDate>
<Issuer>libdcp</Issuer>
@@ -9,7 +9,7 @@
<Asset>
<Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
<AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText>
- <Hash>P2gjv5LMQFMu0BH4RLAfFVVXNRA=</Hash>
+ <Hash>hu0RaV4ZgrcqQQtgOW4r/YznVo0=</Hash>
<Size>1105</Size>
<Type>text/xml;asdcpKind=CPL</Type>
</Asset>
diff --git a/test/verify_test.cc b/test/verify_test.cc
index e025a013..f1213c10 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE (verify_test1)
list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
boost::filesystem::path const cpl_file = "build/test/verify_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml";
- boost::filesystem::path const pkl_file = "build/test/verify_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml";
+ boost::filesystem::path const pkl_file = "build/test/verify_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml";
boost::filesystem::path const assetmap_file = "build/test/verify_test1/ASSETMAP.xml";
list<pair<string, optional<boost::filesystem::path> > >::const_iterator st = stages.begin();
@@ -213,7 +213,7 @@ BOOST_AUTO_TEST_CASE (verify_test3)
vector<boost::filesystem::path> directories = setup (1, 3);
{
- Editor e ("build/test/verify_test3/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml");
+ Editor e ("build/test/verify_test3/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml");
e.replace ("<Hash>", "<Hash>x");
}
@@ -271,7 +271,7 @@ static
boost::filesystem::path
pkl (int n)
{
- return dcp::String::compose("build/test/verify_test%1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml", n);
+ return dcp::String::compose("build/test/verify_test%1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml", n);
}
static
@@ -428,7 +428,7 @@ BOOST_AUTO_TEST_CASE (verify_test11)
{
check_after_replace (
11, &pkl,
- "<Id>urn:uuid:ae8", "<Id>urn:uuid:xe8",
+ "<Id>urn:uuid:18b", "<Id>urn:uuid:x8b",
dcp::VerificationNote::XML_VALIDATION_ERROR
);
}
@@ -438,7 +438,7 @@ BOOST_AUTO_TEST_CASE (verify_test12)
{
check_after_replace (
12, &asset_map,
- "<Id>urn:uuid:74e", "<Id>urn:uuid:x4e",
+ "<Id>urn:uuid:ae8", "<Id>urn:uuid:xe8",
dcp::VerificationNote::XML_VALIDATION_ERROR
);
}
diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index 30220420..dd51d919 100644
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -391,7 +391,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
check_xml (
dcp::file_to_string("test/ref/write_interop_subtitle_test3/pkl.xml"),
- dcp::file_to_string("build/test/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml"),
+ dcp::file_to_string("build/test/write_interop_subtitle_test3/pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml"),
list<string>()
);
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-07 21:18:15 +0000