Test an Interop DCP (dcp_test7) with associated churn in the following test.

12 files changed, 53 insertions, 24 deletions

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index ffc5fb2a..82cb8c44 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -40,8 +40,8 @@
 using std::string;
 using boost::shared_ptr;
 
-/** Test creation of a 2D DCP from very simple inputs */
-BOOST_AUTO_TEST_CASE (dcp_test1)
+static shared_ptr<dcp::DCP>
+make_simple (boost::filesystem::path path)
 {
 	Kumu::cth_test = true;
 
@@ -57,9 +57,9 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 	mxf_meta.product_version = "0.0.25";
 
 	/* We're making build/test/DCP/dcp_test1 */
-	boost::filesystem::remove_all ("build/test/DCP/dcp_test1");
-	boost::filesystem::create_directories ("build/test/DCP/dcp_test1");
-	dcp::DCP d ("build/test/DCP/dcp_test1");
+	boost::filesystem::remove_all (path);
+	boost::filesystem::create_directories (path);
+	shared_ptr<dcp::DCP> d (new dcp::DCP (path));
 	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
 	cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00");
 	cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00");
@@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 
 	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1)));
 	mp->set_metadata (mxf_meta);
-	shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test1/video.mxf", dcp::SMPTE, false);
+	shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write (path / "video.mxf", dcp::SMPTE, false);
 	dcp::File j2c ("test/data/32x32_red_square.j2c");
 	for (int i = 0; i < 24; ++i) {
 		picture_writer->write (j2c.data (), j2c.size ());
@@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 
 	shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1));
 	ms->set_metadata (mxf_meta);
-	shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test1/audio.mxf", dcp::SMPTE);
+	shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write (path / "audio.mxf", dcp::SMPTE);
 
 	SF_INFO info;
 	info.format = 0;
@@ -102,10 +102,19 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 				  )
 			  ));
 
-	d.add (cpl);
-
-	d.write_xml (dcp::SMPTE, xml_meta);
+	d->add (cpl);
+	return d;
+}
 
+/** Test creation of a 2D SMPTE DCP from very simple inputs */
+BOOST_AUTO_TEST_CASE (dcp_test1)
+{
+	dcp::XMLMetadata xml_meta;
+	xml_meta.annotation_text = "Created by libdcp";
+	xml_meta.issuer = "OpenDCP 0.0.25";
+	xml_meta.creator = "OpenDCP 0.0.25";
+	xml_meta.issue_date = "2012-07-17T04:45:18+00:00";
+	make_simple("build/test/DCP/dcp_test1")->write_xml (dcp::SMPTE, xml_meta);
 	/* build/test/DCP/dcp_test1 is checked against test/ref/DCP/dcp_test1 by run/tests */
 }
 
@@ -295,3 +304,15 @@ BOOST_AUTO_TEST_CASE (dcp_test6)
 	BOOST_CHECK (!dcp.cpls().front()->reels().front()->main_subtitle());
 	BOOST_CHECK (dcp.cpls().front()->reels().front()->atmos());
 }
+
+/** Test creation of a 2D Interop DCP from very simple inputs */
+BOOST_AUTO_TEST_CASE (dcp_test7)
+{
+	dcp::XMLMetadata xml_meta;
+	xml_meta.annotation_text = "Created by libdcp";
+	xml_meta.issuer = "OpenDCP 0.0.25";
+	xml_meta.creator = "OpenDCP 0.0.25";
+	xml_meta.issue_date = "2012-07-17T04:45:18+00:00";
+	make_simple("build/test/DCP/dcp_test7")->write_xml (dcp::INTEROP, xml_meta);
+	/* build/test/DCP/dcp_test7 is checked against test/ref/DCP/dcp_test7 by run/tests */
+}
diff --git a/test/ref/DCP/dcp_test7/ASSETMAP b/test/ref/DCP/dcp_test7/ASSETMAP
new file mode 100644
index 00000000..c4a593cc
--- /dev/null
+++ b/test/ref/DCP/dcp_test7/ASSETMAP
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<AssetMap xmlns="http://www.digicine.com/PROTO-ASDCP-AM-20040311#"><Id>urn:uuid:a800aea0-904b-4bd0-9250-374fdb46528b</Id><AnnotationText>Created by libdcp</AnnotationText><VolumeCount>1</VolumeCount><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:f3452d7a-2f0d-4758-b0ab-63432f863752</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_f3452d7a-2f0d-4758-b0ab-63432f863752.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1096</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:abf9d74a-c344-40a0-a929-21add8a3bd6e</Id><ChunkList><Chunk><Path>cpl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1376</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:541baeba-b69b-4459-927d-e5b0fb6b4401</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>26080</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:022f2305-0dcb-4383-8cf2-13244ec2cbe8</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/ref/DCP/dcp_test7/VOLINDEX b/test/ref/DCP/dcp_test7/VOLINDEX
new file mode 100644
index 00000000..11c7615f
--- /dev/null
+++ b/test/ref/DCP/dcp_test7/VOLINDEX
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VolumeIndex xmlns="http://www.digicine.com/PROTO-ASDCP-VL-20040311#"><Index>1</Index></VolumeIndex>
diff --git a/test/ref/DCP/dcp_test7/audio.mxf b/test/ref/DCP/dcp_test7/audio.mxf
new file mode 100644
index 00000000..0bc5617d
--- /dev/null
+++ b/test/ref/DCP/dcp_test7/audio.mxf
diff --git a/test/ref/DCP/dcp_test7/cpl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml b/test/ref/DCP/dcp_test7/cpl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml
new file mode 100644
index 00000000..0e164c01
--- /dev/null
+++ b/test/ref/DCP/dcp_test7/cpl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompositionPlaylist xmlns="http://www.digicine.com/PROTO-ASDCP-CPL-20040511#"><Id>urn:uuid:abf9d74a-c344-40a0-a929-21add8a3bd6e</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:12bf0684-8027-4818-8a1e-0d3536795ed8</Id><AssetList><MainPicture><Id>urn:uuid:541baeba-b69b-4459-927d-e5b0fb6b4401</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>HyS2ZXTYXk0JSNRIRcmt/z7ANZo=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>1.33</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:022f2305-0dcb-4383-8cf2-13244ec2cbe8</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>yf5S893SL8QAkrhpUXY8GHsLq3Q=</Hash></MainSound></AssetList></Reel></ReelList></CompositionPlaylist>
diff --git a/test/ref/DCP/dcp_test7/pkl_f3452d7a-2f0d-4758-b0ab-63432f863752.xml b/test/ref/DCP/dcp_test7/pkl_f3452d7a-2f0d-4758-b0ab-63432f863752.xml
new file mode 100644
index 00000000..21b4c579
--- /dev/null
+++ b/test/ref/DCP/dcp_test7/pkl_f3452d7a-2f0d-4758-b0ab-63432f863752.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#"><Id>urn:uuid:f3452d7a-2f0d-4758-b0ab-63432f863752</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:abf9d74a-c344-40a0-a929-21add8a3bd6e</Id><AnnotationText>abf9d74a-c344-40a0-a929-21add8a3bd6e</AnnotationText><Hash>cj96TLbNHGr0S4M5WxcLrA0aNHg=</Hash><Size>1376</Size><Type>text/xml;asdcpKind=CPL</Type></Asset><Asset><Id>urn:uuid:541baeba-b69b-4459-927d-e5b0fb6b4401</Id><AnnotationText>541baeba-b69b-4459-927d-e5b0fb6b4401</AnnotationText><Hash>HyS2ZXTYXk0JSNRIRcmt/z7ANZo=</Hash><Size>26080</Size><Type>application/x-smpte-mxf;asdcpKind=Picture</Type></Asset><Asset><Id>urn:uuid:022f2305-0dcb-4383-8cf2-13244ec2cbe8</Id><AnnotationText>022f2305-0dcb-4383-8cf2-13244ec2cbe8</AnnotationText><Hash>yf5S893SL8QAkrhpUXY8GHsLq3Q=</Hash><Size>161326</Size><Type>application/x-smpte-mxf;asdcpKind=Sound</Type></Asset></AssetList></PackingList>
diff --git a/test/ref/DCP/dcp_test7/video.mxf b/test/ref/DCP/dcp_test7/video.mxf
new file mode 100644
index 00000000..d4dbc92e
--- /dev/null
+++ b/test/ref/DCP/dcp_test7/video.mxf
diff --git a/test/ref/DCP/encryption_test/ASSETMAP.xml b/test/ref/DCP/encryption_test/ASSETMAP.xml
index 7814c9a4..fba2876c 100644
--- a/test/ref/DCP/encryption_test/ASSETMAP.xml
+++ b/test/ref/DCP/encryption_test/ASSETMAP.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:9a5cc86d-e865-4317-ba80-a429f959cdd0</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:de125b93-db76-41d3-bccd-73deb5b2bb49</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_de125b93-db76-41d3-bccd-73deb5b2bb49.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>8153</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:975df3ad-1ace-4c08-aa20-c729ffa5a6b1</Id><ChunkList><Chunk><Path>cpl_975df3ad-1ace-4c08-aa20-c729ffa5a6b1.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>8618</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:e3146267-6089-4647-87d8-071cda0f9063</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>29896</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:b177f5a2-0d5b-4e7a-b5e3-34c04cfda6d4</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>165454</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
+<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:7201334f-ab80-427e-b3b2-e6ab5c8daa0b</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:496abf91-d4ce-4a90-ada6-32d0b2d767ee</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_496abf91-d4ce-4a90-ada6-32d0b2d767ee.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>8153</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:03d350d6-3df6-4913-90dc-14ea1b1d7908</Id><ChunkList><Chunk><Path>cpl_03d350d6-3df6-4913-90dc-14ea1b1d7908.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>8618</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:f26f4f50-9e6e-4a2a-bfa9-d24e80759a42</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>29896</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:d3f6568f-1e24-4621-8157-f37746c664f7</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>165454</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
diff --git a/test/ref/DCP/encryption_test/audio.mxf b/test/ref/DCP/encryption_test/audio.mxf
index 53340ac8..05e54b79 100644
--- a/test/ref/DCP/encryption_test/audio.mxf
+++ b/test/ref/DCP/encryption_test/audio.mxf
diff --git a/test/ref/DCP/encryption_test/cpl_975df3ad-1ace-4c08-aa20-c729ffa5a6b1.xml b/test/ref/DCP/encryption_test/cpl_03d350d6-3df6-4913-90dc-14ea1b1d7908.xml
index 8cc62807..b941650f 100644
--- a/test/ref/DCP/encryption_test/cpl_975df3ad-1ace-4c08-aa20-c729ffa5a6b1.xml
+++ b/test/ref/DCP/encryption_test/cpl_03d350d6-3df6-4913-90dc-14ea1b1d7908.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:975df3ad-1ace-4c08-aa20-c729ffa5a6b1</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:aeca384d-e91d-451d-93de-12d5eddb6cb5</Id><AssetList><MainPicture><Id>urn:uuid:e3146267-6089-4647-87d8-071cda0f9063</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:a9c8fc99-1853-4fb3-885c-634160d09cb0</KeyId><Hash>aUTqa7a8OuzPa3bLYwh9kFVi1T8=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:b177f5a2-0d5b-4e7a-b5e3-34c04cfda6d4</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:899a0acb-6864-412d-a976-2b7d949c5d08</KeyId><Hash>9zMCdZLeqvkJOE8Ixobv0GExLw0=</Hash></MainSound></AssetList></Reel></ReelList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName></dsig:X509Data></Signer><dsig:Signature><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><dsig:Reference URI=""><dsig:Transforms><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>CmacYfUXbWtNYIqHqT5baM0nKPs=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>i503holT0TV4gXrNoYyYY3B1thkQUo6GL02HNPrdwALIXA08tkSg/y/sF0yuEVVk
-at/V+cQJZU+jO4C5oX+0mcodH0xktAZ7tcBMKaGM2Opc1rh0W3K21ijt2MAVSHP4
-AqVgRGJef3fVKy8kkv27p1N3yoFW1gUnHgLOvrT22KoZY5f7MxZ1oIf6dnkgPkaX
-WquVCn0eBVjH8nSDZXjJ5VylpfF05AONZgwC3VWhvKJK7RJbuzRw2eKm/1TfjAJw
-kwB/r/MeIu9notMLexN64oKJijQGwn5Cx9e8s/L+4NzOQDcIPFPC5mc6f8uealbo
-28Et9o4fahIRdHYNVvTaMA==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
+<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:03d350d6-3df6-4913-90dc-14ea1b1d7908</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:e56d0c3e-cfca-4188-b3f6-c50f3b08de1c</Id><AssetList><MainPicture><Id>urn:uuid:f26f4f50-9e6e-4a2a-bfa9-d24e80759a42</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:59258072-33a6-4692-9947-bdbb1b3b1163</KeyId><Hash>21baGGNpG//PEEKYnaR6Xxb2q1Q=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:d3f6568f-1e24-4621-8157-f37746c664f7</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:4e1b01a8-579b-4cd0-8e04-7a7ba46c86ff</KeyId><Hash>IKCemhDLZQpi6O98ERA3cF82YLo=</Hash></MainSound></AssetList></Reel></ReelList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName></dsig:X509Data></Signer><dsig:Signature><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><dsig:Reference URI=""><dsig:Transforms><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>zsWGeCxlxqxqh4ocjEm47HTK8Go=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>ielTzY70QrVk3utAYLKxQExEw51s8o2fXTKqtK3JyfxppHcubBiYE/7H2akWlIre
+bTfJYZFUc5Gia70goxKeFCQU5xKgWcqMy41XSMb43h6mwLB3v5mHMy6sGIve+09q
+HRnQozaXZtZE1sx2xLfS7D/Lp6ZRG/AniHt5H7dLXcdqm/ER4SL3WbuO8Ycg6gXD
+zUdAnqM493OYX480rzmnQPwq4sGjo8EdvIH2mMdDGMLZIjluSTCTtP4W+2peb6QH
+Z773+HYPR7MHsTbIS1TcqGxyTPui4oeQMDhUQnvgSL0/V4lUPhDuWUVoNSK5IYjj
+V9ziUDXkEMlICA545QTv4A==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
 NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
 NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y
diff --git a/test/ref/DCP/encryption_test/pkl_de125b93-db76-41d3-bccd-73deb5b2bb49.xml b/test/ref/DCP/encryption_test/pkl_496abf91-d4ce-4a90-ada6-32d0b2d767ee.xml
index 57cd12c3..cfb00ebc 100644
--- a/test/ref/DCP/encryption_test/pkl_de125b93-db76-41d3-bccd-73deb5b2bb49.xml
+++ b/test/ref/DCP/encryption_test/pkl_496abf91-d4ce-4a90-ada6-32d0b2d767ee.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:de125b93-db76-41d3-bccd-73deb5b2bb49</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:975df3ad-1ace-4c08-aa20-c729ffa5a6b1</Id><AnnotationText>975df3ad-1ace-4c08-aa20-c729ffa5a6b1</AnnotationText><Hash>2aBaofl0cfNVZJw3RcHsHJWn+8M=</Hash><Size>8618</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:e3146267-6089-4647-87d8-071cda0f9063</Id><AnnotationText>e3146267-6089-4647-87d8-071cda0f9063</AnnotationText><Hash>aUTqa7a8OuzPa3bLYwh9kFVi1T8=</Hash><Size>29896</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:b177f5a2-0d5b-4e7a-b5e3-34c04cfda6d4</Id><AnnotationText>b177f5a2-0d5b-4e7a-b5e3-34c04cfda6d4</AnnotationText><Hash>9zMCdZLeqvkJOE8Ixobv0GExLw0=</Hash><Size>165454</Size><Type>application/mxf</Type></Asset></AssetList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName></dsig:X509Data></Signer><dsig:Signature><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><dsig:Reference URI=""><dsig:Transforms><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>tzUACzSZAox5Bl2hA0/X7F2gv8I=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>gCjlb4yuSk+8Jr9MRT7AuxBt0FSi5spviKZ2RF057HWEZTNAQ7sAOr3bPRyn1W1F
-ySCYm0+VM/K5QitCHUfMNE6GlL1BxypKwreqKw0edRwqP0jNG8V8mmhzfBUKs5DD
-Sl8buBgRKAosMAfZ6R4ZbiDiTVJa76vx0wmIhvY/7JQjlek6RWFNR5QmGFZJzloy
-LlzpHej4sluFLKJkTwAPOH6rlLXYyKkDk4zBeYsmKkNVQzih0OG2OFR4pBwDM3w9
-S8Ugp9JmJd5Xipd8SsnnKO/Uzcb/1iy2BkoM8iHr2L3mutwv9RnxZuLsMDIFKiP7
-FWlve0in0pZcS2TDIdRxEQ==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
+<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:496abf91-d4ce-4a90-ada6-32d0b2d767ee</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:03d350d6-3df6-4913-90dc-14ea1b1d7908</Id><AnnotationText>03d350d6-3df6-4913-90dc-14ea1b1d7908</AnnotationText><Hash>3SqpSjDq7OxwT9JTqI6nkmak/xM=</Hash><Size>8618</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:f26f4f50-9e6e-4a2a-bfa9-d24e80759a42</Id><AnnotationText>f26f4f50-9e6e-4a2a-bfa9-d24e80759a42</AnnotationText><Hash>21baGGNpG//PEEKYnaR6Xxb2q1Q=</Hash><Size>29896</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:d3f6568f-1e24-4621-8157-f37746c664f7</Id><AnnotationText>d3f6568f-1e24-4621-8157-f37746c664f7</AnnotationText><Hash>IKCemhDLZQpi6O98ERA3cF82YLo=</Hash><Size>165454</Size><Type>application/mxf</Type></Asset></AssetList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName></dsig:X509Data></Signer><dsig:Signature><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><dsig:Reference URI=""><dsig:Transforms><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>I/0zUV9RYnKcNegC20g+EatJiLI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>eyFp4CXmBbuQnX5PCcCwnJlB5Zm3oQGOzIaRDouiPE2nhlcmYYaHS2gHRbLL69Xj
+PLvKXdHDPMo+jBrjNkzem0r+D8BHFX72PlDUikWkiF5kidtoBk5Cs032RSxqmQme
+lFk+wKQNCkcT3gO+DMOclkxuO1JBBLGCcsACd9RQmMqH0qf5x9HDJfDXHAZtngft
+xRtRMfpIWgS3QwJwu/LlFLGJ31DBrCh6hIueg5dkNRNF4ruJxccEVIIAIupMeEYM
+sfNDQy1cltRN2o5o7hezTSVXlm0WsIUwj4uJurwaDYixX6RQWQUYPJYwuqjxM5x5
+IOpsjJA8xkvqT99XiJmQBQ==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
 NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
 NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y
diff --git a/test/ref/DCP/encryption_test/video.mxf b/test/ref/DCP/encryption_test/video.mxf
index b1e1ce86..00f74878 100644
--- a/test/ref/DCP/encryption_test/video.mxf
+++ b/test/ref/DCP/encryption_test/video.mxf