Make some tests repeatable across platforms.
authorCarl Hetherington <cth@carlh.net>
Mon, 2 May 2022 15:49:32 +0000 (17:49 +0200)
committerCarl Hetherington <cth@carlh.net>
Wed, 4 May 2022 17:37:38 +0000 (19:37 +0200)
50 files changed:
cscript
test/cpl_metadata_test.cc
test/frame_info_hash_test.cc
test/interop_subtitle_test.cc
test/make_digest_test.cc
test/recovery_test.cc
test/ref/DCP/dcp_test1/ASSETMAP.xml
test/ref/DCP/dcp_test1/audio.mxf
test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml [new file with mode: 0644]
test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml [deleted file]
test/ref/DCP/dcp_test1/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml [deleted file]
test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml [new file with mode: 0644]
test/ref/DCP/dcp_test1/video.mxf
test/ref/DCP/dcp_test2/ASSETMAP.xml
test/ref/DCP/dcp_test2/audio.mxf
test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml [new file with mode: 0644]
test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml [deleted file]
test/ref/DCP/dcp_test2/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml [deleted file]
test/ref/DCP/dcp_test2/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml [new file with mode: 0644]
test/ref/DCP/dcp_test2/video.mxf
test/ref/DCP/dcp_test5/ASSETMAP.xml
test/ref/DCP/dcp_test5/audio.mxf
test/ref/DCP/dcp_test5/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml [new file with mode: 0644]
test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml [deleted file]
test/ref/DCP/dcp_test5/pkl_017b3de4-6dda-408d-b19b-6711354b0bc3.xml [new file with mode: 0644]
test/ref/DCP/dcp_test5/pkl_5d51e8a1-b2a5-4da6-9b66-4615c3609440.xml [deleted file]
test/ref/DCP/dcp_test5/video.mxf
test/ref/DCP/dcp_test7/ASSETMAP
test/ref/DCP/dcp_test7/audio.mxf
test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml [new file with mode: 0644]
test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml [deleted file]
test/ref/DCP/dcp_test7/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml [deleted file]
test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml [new file with mode: 0644]
test/ref/DCP/dcp_test7/video.mxf
test/ref/DCP/encryption_test/ASSETMAP.xml
test/ref/DCP/encryption_test/audio.mxf
test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml [new file with mode: 0644]
test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml [deleted file]
test/ref/DCP/encryption_test/pkl_8ee8f7da-8da2-4adb-ae0e-31e8f4b91900.xml [deleted file]
test/ref/DCP/encryption_test/pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml [new file with mode: 0644]
test/ref/DCP/encryption_test/video.mxf
test/ref/write_interop_subtitle_test3/ASSETMAP
test/ref/write_interop_subtitle_test3/cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml [deleted file]
test/ref/write_interop_subtitle_test3/cpl_5407b210-4441-4e97-8b16-8bdc7c12da54.xml [new file with mode: 0644]
test/ref/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png [deleted file]
test/ref/write_interop_subtitle_test3/dd015243-ab77-435c-a13d-690566885121.png [new file with mode: 0644]
test/ref/write_interop_subtitle_test3/pkl_ac8d301c-e5d9-4343-b6f3-ba2668adbe56.xml [new file with mode: 0644]
test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml [deleted file]
test/ref/write_interop_subtitle_test3/subs.xml
test/verify_test.cc

diff --git a/cscript b/cscript
index 84fa6111ab5d687df82200d3d93c5ba242829f2d..d566a971b81500518176ae268c59cc7b95059b2e 100644 (file)
--- a/cscript
+++ b/cscript
@@ -39,9 +39,9 @@ option_defaults = { 'jpeg': 'oj2' }
 def dependencies(target, options):
     libcxml = ('libcxml', 'v0.17.3')
     if options['jpeg'] == 'oj1':
-        return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', 'c5b8b7e1e229895b8afcb20287f22f90dd8e9d45'))
+        return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', 'ee04871698c10aa4d9736d3457bf74ff68a07b5d'))
     else:
-        return (libcxml, ('openjpeg', 'a1403c2'), ('asdcplib', 'c5b8b7e1e229895b8afcb20287f22f90dd8e9d45'))
+        return (libcxml, ('openjpeg', 'a1403c2'), ('asdcplib', 'ee04871698c10aa4d9736d3457bf74ff68a07b5d'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory
index b90aae4a9c40a1b5f9c15985fdc29c22d9172b7e..b141d271d4a85483a625f2ca6c7aea584bce09fd 100644 (file)
@@ -316,7 +316,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test1)
        check_xml (
                dcp::file_to_string("test/ref/cpl_metadata_test1.xml"),
                dcp::file_to_string("build/test/cpl_metadata_write_test1.xml"),
-               vector<string>()
+               {"Id", "Hash"}
                );
 }
 
@@ -326,12 +326,10 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_roundtrip_test_1)
 {
        dcp::CPL cpl ("test/ref/cpl_metadata_test1.xml");
        cpl.write_xml ("build/test/cpl_metadata_roundtrip_test1.xml", shared_ptr<dcp::CertificateChain>());
-       vector<string> ignore;
-       ignore.push_back ("Id");
        check_xml (
                dcp::file_to_string("test/ref/cpl_metadata_test1.xml"),
                dcp::file_to_string("build/test/cpl_metadata_roundtrip_test1.xml"),
-               ignore
+               {"Id"}
                );
 }
 
@@ -367,7 +365,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test2)
        check_xml (
                dcp::file_to_string("test/ref/cpl_metadata_test2.xml"),
                dcp::file_to_string("build/test/cpl_metadata_write_test2.xml"),
-               vector<string>()
+               {"Id", "Hash"}
                );
 }
 
index 3033bb5b596e3e97f89ee30005573a5d2dd4f9b0..ed91491665340ee56f4efe7ac3a7dd8fbc6c35f4 100644 (file)
@@ -36,6 +36,7 @@
 #include "mono_picture_asset.h"
 #include "mono_picture_asset_writer.h"
 #include "openjpeg_image.h"
+#include <boost/random.hpp>
 #include <boost/test/unit_test.hpp>
 #include <memory>
 
@@ -46,12 +47,12 @@ using std::string;
 
 
 static void
-check (shared_ptr<dcp::PictureAssetWriter> writer, string hash)
+check (shared_ptr<dcp::PictureAssetWriter> writer, boost::random::uniform_int_distribution<>& dist, boost::random::mt19937& rng, string hash)
 {
        auto xyz = make_shared<dcp::OpenJPEGImage>(dcp::Size(1998, 1080));
        for (int c = 0; c < 3; ++c) {
                for (int p = 0; p < (1998 * 1080); ++p) {
-                       xyz->data(c)[p] = rand() & 0xfff;
+                       xyz->data(c)[p] = dist(rng);
                }
        }
 
@@ -68,10 +69,11 @@ BOOST_AUTO_TEST_CASE (frame_info_hash_test)
        auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
        auto writer = mp->start_write ("build/test/frame_info_hash_test.mxf", false);
 
-       srand(42);
+       boost::random::mt19937 rng(1);
+       boost::random::uniform_int_distribution<> dist(0, 4095);
 
        /* Check a few random frames */
-       check (writer, "9da3d1d93a80683e65d996edae4101ed");
-       check (writer, "ecd77b3fbf459591f24119d4118783fb");
-       check (writer, "9f10303495b58ccb715c893d40127e22");
+       check(writer, dist, rng, "a9e772602a2fd3135d940cfd727ab8ff");
+       check(writer, dist, rng, "b075369922e42b23e1852a586ec43224");
+       check(writer, dist, rng, "402395e76152db05b03c8f24ddfd7732");
 }
index 2d7c606a3e9a211a9ea2065f4ebce0ef31a05faf..3c500069985a23731e0987cfabe89e7f89df64e2 100644 (file)
@@ -928,7 +928,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
                dcp::file_to_string("build/test/write_interop_subtitle_test3/subs.xml"),
                vector<string>()
                );
-       check_file ("build/test/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png", "test/data/sub.png");
+       check_file(find_file("build/test/write_interop_subtitle_test3", ".png"), "test/data/sub.png");
 
        check_xml (
                dcp::file_to_string("test/ref/write_interop_subtitle_test3/ASSETMAP"),
index 9d37f837cd34e360e2be02da717245c3d40d4b59..98792e62910a8da286a5638ef1a4dcc3567891da 100644 (file)
@@ -35,6 +35,7 @@
 #include "array_data.h"
 #include "util.h"
 #include <boost/bind.hpp>
+#include <boost/random.hpp>
 #include <boost/test/unit_test.hpp>
 #include <sys/time.h>
 
@@ -49,15 +50,18 @@ void progress (float)
 BOOST_AUTO_TEST_CASE (make_digest_test)
 {
        /* Make a big file with some random data */
-       srand (1);
+
+       boost::random::mt19937 rng(1);
+       boost::random::uniform_int_distribution<> dist(0, 255);
+
        int const N = 256 * 1024 * 1024;
        dcp::ArrayData data (N);
        auto p = data.data();
        for (int i = 0; i < N; ++i) {
-               *p++ = rand() & 0xff;
+               *p++ = dist(rng);
        }
        data.write ("build/test/random");
 
        /* Hash it */
-       BOOST_CHECK_EQUAL (dcp::make_digest("build/test/random", boost::bind(&progress, _1)), "GKbk/V3fcRtP5MaPdSmAGNbKkaU=");
+       BOOST_CHECK_EQUAL (dcp::make_digest("build/test/random", boost::bind(&progress, _1)), "HayqPBWBRKqLNgfuo4XSajc+D5s=");
 }
index 1f76b964acc14b3965ff2c3f7cfc9f24ed19bccf..62cb961a8765040f205a84d53866ec52b5157c67 100644 (file)
@@ -77,9 +77,7 @@ BOOST_AUTO_TEST_CASE (recovery)
                fclose (f);
        }
 
-#ifndef LIBDCP_WINDOWS
        Kumu::ResetTestRNG ();
-#endif
 
        mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
        writer = mp->start_write ("build/test/baz/video2.mxf", true);
index 962afeb3fd3c2397dc2b24ce55740dab25975571..f805bb28fa04b1fea351b1fd4bd655115e134a16 100644 (file)
@@ -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:017b3de4-6dda-408d-b19b-6711354b0bc3</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:6af1e0c1-c441-47f8-a502-3efd46b1fa4f</Id>
+      <Id>urn:uuid:d199d58b-5ef8-4d49-b270-07e590ccb280</Id>
       <PackingList>true</PackingList>
       <ChunkList>
         <Chunk>
-          <Path>pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml</Path>
+          <Path>pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1179</Length>
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
+      <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
       <ChunkList>
         <Chunk>
-          <Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path>
+          <Path>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>8559</Length>
@@ -31,7 +31,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
+      <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
       <ChunkList>
         <Chunk>
           <Path>video.mxf</Path>
@@ -42,7 +42,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id>
+      <Id>urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa</Id>
       <ChunkList>
         <Chunk>
           <Path>audio.mxf</Path>
index f095f00aacdfb89c3d224a3a17b2ea307a24b786..5e08f74f86b8b05b36fffb5eb52a9b0300621fd3 100644 (file)
Binary files a/test/ref/DCP/dcp_test1/audio.mxf and b/test/ref/DCP/dcp_test1/audio.mxf differ
diff --git a/test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
new file mode 100644 (file)
index 0000000..15cda9a
--- /dev/null
@@ -0,0 +1,153 @@
+<?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>trailer</ContentKind>
+  <ContentVersion>
+    <Id>urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11</Id>
+    <LabelText>content-version-label-text</LabelText>
+  </ContentVersion>
+  <RatingList/>
+  <ReelList>
+    <Reel>
+      <Id>urn:uuid:d1102bfd-65c2-465c-ab33-200ace46fcf5</Id>
+      <AssetList>
+        <MainMarkers>
+          <Id>urn:uuid:3b198cbc-c1d2-4410-805c-397b6fea0297</Id>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <MarkerList>
+            <Marker>
+              <Label>FFOC</Label>
+              <Offset>1</Offset>
+            </Marker>
+            <Marker>
+              <Label>LFOC</Label>
+              <Offset>23</Offset>
+            </Marker>
+          </MarkerList>
+        </MainMarkers>
+        <MainPicture>
+          <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>24</Duration>
+          <Hash>wUmt8G+cFFKMGt0ueS9+F1S4uhc=</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>KcJb7S2K5cNm8RG4kfQD5FTeS0A=</Hash>
+        </MainSound>
+        <meta:CompositionMetadataAsset xmlns:meta="http://www.smpte-ra.org/schemas/429-16/2014/CPL-Metadata">
+          <Id>urn:uuid:dd015243-ab77-435c-a13d-690566885121</Id>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <meta:FullContentTitleText/>
+          <meta:VersionNumber>1</meta:VersionNumber>
+          <meta:MainSoundConfiguration>51/L,R,C,LFE,Ls,Rs</meta:MainSoundConfiguration>
+          <meta:MainSoundSampleRate>48000 1</meta:MainSoundSampleRate>
+          <meta:MainPictureStoredArea>
+            <meta:Width>1998</meta:Width>
+            <meta:Height>1080</meta:Height>
+          </meta:MainPictureStoredArea>
+          <meta:MainPictureActiveArea>
+            <meta:Width>1998</meta:Width>
+            <meta:Height>1080</meta:Height>
+          </meta:MainPictureActiveArea>
+          <meta:ExtensionMetadataList>
+            <meta:ExtensionMetadata scope="http://isdcf.com/ns/cplmd/app">
+              <meta:Name>Application</meta:Name>
+              <meta:PropertyList>
+                <meta:Property>
+                  <meta:Name>DCP Constraints Profile</meta:Name>
+                  <meta:Value>SMPTE-RDD-52:2020-Bv2.1</meta:Value>
+                </meta:Property>
+              </meta:PropertyList>
+            </meta:ExtensionMetadata>
+          </meta:ExtensionMetadataList>
+          <mca:MCASubDescriptors xmlns:mca="http://isdcf.com/ns/cplmd/mca" xmlns:r0="http://www.smpte-ra.org/reg/395/2014/13/1/aaf" xmlns:r1="http://www.smpte-ra.org/reg/335/2012">
+            <r0:SoundfieldGroupLabelSubDescriptor>
+              <r1:InstanceID>urn:uuid:6b06fecc-09d7-4b70-b1ae-16b274cb8b25</r1:InstanceID>
+              <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020201.00000000</r1:MCALabelDictionaryID>
+              <r1:MCALinkID>urn:uuid:ddedca3d-a323-4355-a879-029bb90e9d1e</r1:MCALinkID>
+              <r1:MCATagSymbol>sg51</r1:MCATagSymbol>
+              <r1:MCATagName>5.1</r1:MCATagName>
+              <r1:RFC5646SpokenLanguage>en-US</r1:RFC5646SpokenLanguage>
+            </r0:SoundfieldGroupLabelSubDescriptor>
+            <r0:AudioChannelLabelSubDescriptor>
+              <r1:InstanceID>urn:uuid:07cc8cb6-9385-4e33-aa38-bdcbf3a67698</r1:InstanceID>
+              <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020101.00000000</r1:MCALabelDictionaryID>
+              <r1:MCALinkID>urn:uuid:67729deb-ce1f-46be-bd03-e674afa35c36</r1:MCALinkID>
+              <r1:MCATagSymbol>chL</r1:MCATagSymbol>
+              <r1:MCATagName>Left</r1:MCATagName>
+              <r1:MCAChannelID>1</r1:MCAChannelID>
+              <r1:RFC5646SpokenLanguage>en-US</r1:RFC5646SpokenLanguage>
+              <r1:SoundfieldGroupLinkID>urn:uuid:ddedca3d-a323-4355-a879-029bb90e9d1e</r1:SoundfieldGroupLinkID>
+            </r0:AudioChannelLabelSubDescriptor>
+            <r0:AudioChannelLabelSubDescriptor>
+              <r1:InstanceID>urn:uuid:d98861e8-aefc-433d-9e96-1745e7ba039e</r1:InstanceID>
+              <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020102.00000000</r1:MCALabelDictionaryID>
+              <r1:MCALinkID>urn:uuid:bc213c26-3e3f-488e-a99d-d9d0ad30f8f9</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:ddedca3d-a323-4355-a879-029bb90e9d1e</r1:SoundfieldGroupLinkID>
+            </r0:AudioChannelLabelSubDescriptor>
+            <r0:AudioChannelLabelSubDescriptor>
+              <r1:InstanceID>urn:uuid:d76fdaaf-8316-42dc-a87e-1719ad6ca3ca</r1:InstanceID>
+              <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020103.00000000</r1:MCALabelDictionaryID>
+              <r1:MCALinkID>urn:uuid:8577c7c0-be29-4eb5-a449-1e3870a42bbd</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:ddedca3d-a323-4355-a879-029bb90e9d1e</r1:SoundfieldGroupLinkID>
+            </r0:AudioChannelLabelSubDescriptor>
+            <r0:AudioChannelLabelSubDescriptor>
+              <r1:InstanceID>urn:uuid:7a150034-0437-46d1-843c-864baf57adbf</r1:InstanceID>
+              <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020104.00000000</r1:MCALabelDictionaryID>
+              <r1:MCALinkID>urn:uuid:76aef948-ca63-4d4a-b707-27727c55d370</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:ddedca3d-a323-4355-a879-029bb90e9d1e</r1:SoundfieldGroupLinkID>
+            </r0:AudioChannelLabelSubDescriptor>
+            <r0:AudioChannelLabelSubDescriptor>
+              <r1:InstanceID>urn:uuid:5668a4e3-2941-40a5-826e-c47d228239e9</r1:InstanceID>
+              <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020105.00000000</r1:MCALabelDictionaryID>
+              <r1:MCALinkID>urn:uuid:cbeeef80-f3bc-4407-bd4b-2e546fea6945</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:ddedca3d-a323-4355-a879-029bb90e9d1e</r1:SoundfieldGroupLinkID>
+            </r0:AudioChannelLabelSubDescriptor>
+            <r0:AudioChannelLabelSubDescriptor>
+              <r1:InstanceID>urn:uuid:b04ce7c7-3f9f-45c2-b70c-a0f2cafbe391</r1:InstanceID>
+              <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020106.00000000</r1:MCALabelDictionaryID>
+              <r1:MCALinkID>urn:uuid:ce0f527a-a71e-4b60-a5ab-da9d6dd7882e</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:ddedca3d-a323-4355-a879-029bb90e9d1e</r1:SoundfieldGroupLinkID>
+            </r0:AudioChannelLabelSubDescriptor>
+          </mca:MCASubDescriptors>
+        </meta:CompositionMetadataAsset>
+      </AssetList>
+    </Reel>
+  </ReelList>
+</CompositionPlaylist>
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
deleted file mode 100644 (file)
index 6c1b2ad..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL">
-  <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</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>trailer</ContentKind>
-  <ContentVersion>
-    <Id>urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11</Id>
-    <LabelText>content-version-label-text</LabelText>
-  </ContentVersion>
-  <RatingList/>
-  <ReelList>
-    <Reel>
-      <Id>urn:uuid:793170e7-e913-404b-8942-1c7f2e5cf012</Id>
-      <AssetList>
-        <MainMarkers>
-          <Id>urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff</Id>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <MarkerList>
-            <Marker>
-              <Label>FFOC</Label>
-              <Offset>1</Offset>
-            </Marker>
-            <Marker>
-              <Label>LFOC</Label>
-              <Offset>23</Offset>
-            </Marker>
-          </MarkerList>
-        </MainMarkers>
-        <MainPicture>
-          <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <Hash>gVKhC9IkWyzQbgzpFcJ1bpqbtwk=</Hash>
-          <FrameRate>24 1</FrameRate>
-          <ScreenAspectRatio>1998 1080</ScreenAspectRatio>
-        </MainPicture>
-        <MainSound>
-          <Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <Hash>Lq7ot/GobgrqUYdlbR8FCD5APqs=</Hash>
-        </MainSound>
-        <meta:CompositionMetadataAsset xmlns:meta="http://www.smpte-ra.org/schemas/429-16/2014/CPL-Metadata">
-          <Id>urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71</Id>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <meta:FullContentTitleText/>
-          <meta:VersionNumber>1</meta:VersionNumber>
-          <meta:MainSoundConfiguration>51/L,R,C,LFE,Ls,Rs</meta:MainSoundConfiguration>
-          <meta:MainSoundSampleRate>48000 1</meta:MainSoundSampleRate>
-          <meta:MainPictureStoredArea>
-            <meta:Width>1998</meta:Width>
-            <meta:Height>1080</meta:Height>
-          </meta:MainPictureStoredArea>
-          <meta:MainPictureActiveArea>
-            <meta:Width>1998</meta:Width>
-            <meta:Height>1080</meta:Height>
-          </meta:MainPictureActiveArea>
-          <meta:ExtensionMetadataList>
-            <meta:ExtensionMetadata scope="http://isdcf.com/ns/cplmd/app">
-              <meta:Name>Application</meta:Name>
-              <meta:PropertyList>
-                <meta:Property>
-                  <meta:Name>DCP Constraints Profile</meta:Name>
-                  <meta:Value>SMPTE-RDD-52:2020-Bv2.1</meta:Value>
-                </meta:Property>
-              </meta:PropertyList>
-            </meta:ExtensionMetadata>
-          </meta:ExtensionMetadataList>
-          <mca:MCASubDescriptors xmlns:mca="http://isdcf.com/ns/cplmd/mca" xmlns:r0="http://www.smpte-ra.org/reg/395/2014/13/1/aaf" xmlns:r1="http://www.smpte-ra.org/reg/335/2012">
-            <r0:SoundfieldGroupLabelSubDescriptor>
-              <r1:InstanceID>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</r1:InstanceID>
-              <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020201.00000000</r1:MCALabelDictionaryID>
-              <r1:MCALinkID>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</r1:MCALinkID>
-              <r1:MCATagSymbol>sg51</r1:MCATagSymbol>
-              <r1:MCATagName>5.1</r1:MCATagName>
-              <r1:RFC5646SpokenLanguage>en-US</r1:RFC5646SpokenLanguage>
-            </r0:SoundfieldGroupLabelSubDescriptor>
-            <r0:AudioChannelLabelSubDescriptor>
-              <r1:InstanceID>urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d</r1:InstanceID>
-              <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020101.00000000</r1:MCALabelDictionaryID>
-              <r1:MCALinkID>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</r1:MCALinkID>
-              <r1:MCATagSymbol>chL</r1:MCATagSymbol>
-              <r1:MCATagName>Left</r1:MCATagName>
-              <r1:MCAChannelID>1</r1:MCAChannelID>
-              <r1:RFC5646SpokenLanguage>en-US</r1:RFC5646SpokenLanguage>
-              <r1:SoundfieldGroupLinkID>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</r1:SoundfieldGroupLinkID>
-            </r0:AudioChannelLabelSubDescriptor>
-            <r0:AudioChannelLabelSubDescriptor>
-              <r1:InstanceID>urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430</r1:InstanceID>
-              <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020102.00000000</r1:MCALabelDictionaryID>
-              <r1:MCALinkID>urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c</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:18be072e-5a0f-44e1-b2eb-c8a52ae12789</r1:SoundfieldGroupLinkID>
-            </r0:AudioChannelLabelSubDescriptor>
-            <r0:AudioChannelLabelSubDescriptor>
-              <r1:InstanceID>urn:uuid:07e9f5a0-83ab-4791-8c6b-7df5d11f76f9</r1:InstanceID>
-              <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020103.00000000</r1:MCALabelDictionaryID>
-              <r1:MCALinkID>urn:uuid:2b9b857f-ab4a-440e-a313-1ace0f1cfc95</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:18be072e-5a0f-44e1-b2eb-c8a52ae12789</r1:SoundfieldGroupLinkID>
-            </r0:AudioChannelLabelSubDescriptor>
-            <r0:AudioChannelLabelSubDescriptor>
-              <r1:InstanceID>urn:uuid:3cf6c3a1-0b08-4033-96b5-1eefaf505371</r1:InstanceID>
-              <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020104.00000000</r1:MCALabelDictionaryID>
-              <r1:MCALinkID>urn:uuid:9780965c-1d68-4829-b2cf-9666b6b91bd9</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:18be072e-5a0f-44e1-b2eb-c8a52ae12789</r1:SoundfieldGroupLinkID>
-            </r0:AudioChannelLabelSubDescriptor>
-            <r0:AudioChannelLabelSubDescriptor>
-              <r1:InstanceID>urn:uuid:0b93e03a-e6c1-4ad1-9a98-223a62c7e37f</r1:InstanceID>
-              <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020105.00000000</r1:MCALabelDictionaryID>
-              <r1:MCALinkID>urn:uuid:18a0931c-9ecf-49cc-b851-8f1c6e0849bf</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:18be072e-5a0f-44e1-b2eb-c8a52ae12789</r1:SoundfieldGroupLinkID>
-            </r0:AudioChannelLabelSubDescriptor>
-            <r0:AudioChannelLabelSubDescriptor>
-              <r1:InstanceID>urn:uuid:7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c</r1:InstanceID>
-              <r1:MCALabelDictionaryID>urn:smpte:ul:060e2b34.0401010d.03020106.00000000</r1:MCALabelDictionaryID>
-              <r1:MCALinkID>urn:uuid:b6a34428-b4a5-4edf-bd3f-cf57be31cd2f</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:18be072e-5a0f-44e1-b2eb-c8a52ae12789</r1:SoundfieldGroupLinkID>
-            </r0:AudioChannelLabelSubDescriptor>
-          </mca:MCASubDescriptors>
-        </meta:CompositionMetadataAsset>
-      </AssetList>
-    </Reel>
-  </ReelList>
-</CompositionPlaylist>
diff --git a/test/ref/DCP/dcp_test1/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml b/test/ref/DCP/dcp_test1/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml
deleted file mode 100644 (file)
index 588c7d4..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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>
-  <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>
-  <AssetList>
-    <Asset>
-      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
-      <AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
-      <Hash>znqYbl53W9ZQtrU2E1FQ6dwdM2M=</Hash>
-      <Size>8559</Size>
-      <Type>text/xml</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
-      <AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText>
-      <Hash>gVKhC9IkWyzQbgzpFcJ1bpqbtwk=</Hash>
-      <Size>49240</Size>
-      <Type>application/mxf</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id>
-      <AnnotationText>8b92bcee-62fc-4a33-a51a-816e9611ce85</AnnotationText>
-      <Hash>Lq7ot/GobgrqUYdlbR8FCD5APqs=</Hash>
-      <Size>881326</Size>
-      <Type>application/mxf</Type>
-    </Asset>
-  </AssetList>
-</PackingList>
diff --git a/test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml b/test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
new file mode 100644 (file)
index 0000000..dd96358
--- /dev/null
@@ -0,0 +1,31 @@
+<?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>
+  <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>
+  <AssetList>
+    <Asset>
+      <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
+      <AnnotationText>6affb8ee-0020-4dff-a53c-17652f6358ab</AnnotationText>
+      <Hash>tfX1mVIKJCVr1m7Y32Nzxf0+Rpw=</Hash>
+      <Size>8559</Size>
+      <Type>text/xml</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
+      <AnnotationText>5407b210-4441-4e97-8b16-8bdc7c12da54</AnnotationText>
+      <Hash>wUmt8G+cFFKMGt0ueS9+F1S4uhc=</Hash>
+      <Size>49240</Size>
+      <Type>application/mxf</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa</Id>
+      <AnnotationText>97f0f352-5b77-48ee-a558-9df37717f4fa</AnnotationText>
+      <Hash>KcJb7S2K5cNm8RG4kfQD5FTeS0A=</Hash>
+      <Size>881326</Size>
+      <Type>application/mxf</Type>
+    </Asset>
+  </AssetList>
+</PackingList>
index 4ff8e3b3bb108a43dff54e5aac9a3fadf252f9ff..27ba41cf867b1fb91847a4d6057e0c9aa74a58b0 100644 (file)
Binary files a/test/ref/DCP/dcp_test1/video.mxf and b/test/ref/DCP/dcp_test1/video.mxf differ
index 23390415593494417831b385ab8d6f0151df91c0..e0adff1e54bd3d5a3643d77087af4312d989a37b 100644 (file)
@@ -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:017b3de4-6dda-408d-b19b-6711354b0bc3</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:d199d58b-5ef8-4d49-b270-07e590ccb280</Id>
       <PackingList>true</PackingList>
       <ChunkList>
         <Chunk>
-          <Path>pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml</Path>
+          <Path>pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1186</Length>
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
+      <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
       <ChunkList>
         <Chunk>
-          <Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path>
+          <Path>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1686</Length>
@@ -31,7 +31,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
+      <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
       <ChunkList>
         <Chunk>
           <Path>video.mxf</Path>
@@ -42,7 +42,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:77e1fb48-ce0c-4d29-bf88-8c3bfec8013a</Id>
+      <Id>urn:uuid:fc843acc-1ad9-4808-b9ed-33f5319e047d</Id>
       <ChunkList>
         <Chunk>
           <Path>audio.mxf</Path>
index 9fc243559fbad2b3a964f9136eb58c075e8fe491..4416225c59938e85a32aaf42cfecd9d415db5e2c 100644 (file)
Binary files a/test/ref/DCP/dcp_test2/audio.mxf and b/test/ref/DCP/dcp_test2/audio.mxf 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
new file mode 100644 (file)
index 0000000..d9eb222
--- /dev/null
@@ -0,0 +1,40 @@
+<?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:3b198cbc-c1d2-4410-805c-397b6fea0297</Id>
+      <AssetList>
+        <MainSound>
+          <Id>urn:uuid:fc843acc-1ad9-4808-b9ed-33f5319e047d</Id>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>24</Duration>
+          <Hash>3PtaGoYcvBdq5WYiK0cmeDwm8d0=</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>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>24</Duration>
+          <Hash>BUpeFS6X9j+X0z2TZWSsLMT4pE0=</Hash>
+          <FrameRate>48 1</FrameRate>
+          <ScreenAspectRatio>1998 1080</ScreenAspectRatio>
+        </msp-cpl:MainStereoscopicPicture>
+      </AssetList>
+    </Reel>
+  </ReelList>
+</CompositionPlaylist>
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
deleted file mode 100644 (file)
index 3910dcd..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL">
-  <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</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:93182bd2-b1e8-41a3-b5c8-6e6564273bff</Id>
-      <AssetList>
-        <MainSound>
-          <Id>urn:uuid:77e1fb48-ce0c-4d29-bf88-8c3bfec8013a</Id>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <Hash>79TC6lDP5q0zzHZRm1wOnrObdYQ=</Hash>
-        </MainSound>
-        <msp-cpl:MainStereoscopicPicture xmlns:msp-cpl="http://www.smpte-ra.org/schemas/429-10/2008/Main-Stereo-Picture-CPL">
-          <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <Hash>JFrPt5QPaWmGMFxMMdYr7MhA3Bs=</Hash>
-          <FrameRate>48 1</FrameRate>
-          <ScreenAspectRatio>1998 1080</ScreenAspectRatio>
-        </msp-cpl:MainStereoscopicPicture>
-      </AssetList>
-    </Reel>
-  </ReelList>
-</CompositionPlaylist>
diff --git a/test/ref/DCP/dcp_test2/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml b/test/ref/DCP/dcp_test2/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml
deleted file mode 100644 (file)
index abfd510..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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>
-  <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:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
-      <AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
-      <Hash>9JCFUMDcUujOZxSqSig3u/5wIuI=</Hash>
-      <Size>1686</Size>
-      <Type>text/xml</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
-      <AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText>
-      <Hash>JFrPt5QPaWmGMFxMMdYr7MhA3Bs=</Hash>
-      <Size>63160</Size>
-      <Type>application/mxf</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:77e1fb48-ce0c-4d29-bf88-8c3bfec8013a</Id>
-      <AnnotationText>77e1fb48-ce0c-4d29-bf88-8c3bfec8013a</AnnotationText>
-      <Hash>79TC6lDP5q0zzHZRm1wOnrObdYQ=</Hash>
-      <Size>161326</Size>
-      <Type>application/mxf</Type>
-    </Asset>
-  </AssetList>
-</PackingList>
diff --git a/test/ref/DCP/dcp_test2/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml b/test/ref/DCP/dcp_test2/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
new file mode 100644 (file)
index 0000000..d116216
--- /dev/null
@@ -0,0 +1,31 @@
+<?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>
+  <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>6F7kAEYbNdv6gz6PG5JcMjGF8kU=</Hash>
+      <Size>1686</Size>
+      <Type>text/xml</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
+      <AnnotationText>5407b210-4441-4e97-8b16-8bdc7c12da54</AnnotationText>
+      <Hash>BUpeFS6X9j+X0z2TZWSsLMT4pE0=</Hash>
+      <Size>63160</Size>
+      <Type>application/mxf</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:fc843acc-1ad9-4808-b9ed-33f5319e047d</Id>
+      <AnnotationText>fc843acc-1ad9-4808-b9ed-33f5319e047d</AnnotationText>
+      <Hash>3PtaGoYcvBdq5WYiK0cmeDwm8d0=</Hash>
+      <Size>161326</Size>
+      <Type>application/mxf</Type>
+    </Asset>
+  </AssetList>
+</PackingList>
index 2cd228ae5a09621d1ff7c330f93e40135703fe97..3b670708817297ecfc096c3e4a739fdf4beffa18 100644 (file)
Binary files a/test/ref/DCP/dcp_test2/video.mxf and b/test/ref/DCP/dcp_test2/video.mxf differ
index fb9f897a194be86c447141890e595b9c611807fc..42b8133bea586e87553c556e60679fbe9944e1ee 100644 (file)
@@ -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:8f8d5c1f-cd57-4bcc-9827-ff398e5832cf</Id>
+  <Id>urn:uuid:4f26ba15-f1bc-450a-aaeb-8a4801ce11d5</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:5d51e8a1-b2a5-4da6-9b66-4615c3609440</Id>
+      <Id>urn:uuid:017b3de4-6dda-408d-b19b-6711354b0bc3</Id>
       <PackingList>true</PackingList>
       <ChunkList>
         <Chunk>
-          <Path>pkl_5d51e8a1-b2a5-4da6-9b66-4615c3609440.xml</Path>
+          <Path>pkl_017b3de4-6dda-408d-b19b-6711354b0bc3.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1186</Length>
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
+      <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
       <ChunkList>
         <Chunk>
-          <Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path>
+          <Path>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>2024</Length>
@@ -31,7 +31,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
+      <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
       <ChunkList>
         <Chunk>
           <Path>video.mxf</Path>
@@ -42,7 +42,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id>
+      <Id>urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa</Id>
       <ChunkList>
         <Chunk>
           <Path>audio.mxf</Path>
index 5e9faba578dd87b5baea3fce0ebf1d17a5aa8597..499ea47ce39df36584fe47700f6a9d99eb3f74ca 100644 (file)
Binary files a/test/ref/DCP/dcp_test5/audio.mxf and b/test/ref/DCP/dcp_test5/audio.mxf 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
new file mode 100644 (file)
index 0000000..eb85a11
--- /dev/null
@@ -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:d199d58b-5ef8-4d49-b270-07e590ccb280</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>wLbXcpQtWt2IFMHIcibxwND667I=</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/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
deleted file mode 100644 (file)
index 6955872..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL">
-  <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</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:6af1e0c1-c441-47f8-a502-3efd46b1fa4f</Id>
-      <AssetList>
-        <MainPicture>
-          <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <Hash>ocljCBd/zl1KRFBVRVTtSmR3qf0=</Hash>
-          <FrameRate>24 1</FrameRate>
-          <ScreenAspectRatio>1998 1080</ScreenAspectRatio>
-        </MainPicture>
-        <MainSound>
-          <Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <Hash>UwaCvlFLCOKQhQB12hdVceJudgc=</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/ref/DCP/dcp_test5/pkl_017b3de4-6dda-408d-b19b-6711354b0bc3.xml
new file mode 100644 (file)
index 0000000..77d67c2
--- /dev/null
@@ -0,0 +1,31 @@
+<?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>
+  <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>kiv8PHo8XZc/lI2xk7qYghrP2SA=</Hash>
+      <Size>2024</Size>
+      <Type>text/xml</Type>
+    </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>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa</Id>
+      <AnnotationText>97f0f352-5b77-48ee-a558-9df37717f4fa</AnnotationText>
+      <Hash>wLbXcpQtWt2IFMHIcibxwND667I=</Hash>
+      <Size>161326</Size>
+      <Type>application/mxf</Type>
+    </Asset>
+  </AssetList>
+</PackingList>
diff --git a/test/ref/DCP/dcp_test5/pkl_5d51e8a1-b2a5-4da6-9b66-4615c3609440.xml b/test/ref/DCP/dcp_test5/pkl_5d51e8a1-b2a5-4da6-9b66-4615c3609440.xml
deleted file mode 100644 (file)
index 0ae84d3..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL">
-  <Id>urn:uuid:5d51e8a1-b2a5-4da6-9b66-4615c3609440</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:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
-      <AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
-      <Hash>+a4c/A2gZJW4rVH5BZ7jbb6qXkc=</Hash>
-      <Size>2024</Size>
-      <Type>text/xml</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
-      <AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText>
-      <Hash>ocljCBd/zl1KRFBVRVTtSmR3qf0=</Hash>
-      <Size>40144</Size>
-      <Type>application/mxf</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id>
-      <AnnotationText>8b92bcee-62fc-4a33-a51a-816e9611ce85</AnnotationText>
-      <Hash>UwaCvlFLCOKQhQB12hdVceJudgc=</Hash>
-      <Size>161326</Size>
-      <Type>application/mxf</Type>
-    </Asset>
-  </AssetList>
-</PackingList>
index 0925dbd7bea2c38df7b30b76397ea1d1329b95c3..f3e7588b8d13ba259ab6a7def2a54fc0b9f73e72 100644 (file)
Binary files a/test/ref/DCP/dcp_test5/video.mxf and b/test/ref/DCP/dcp_test5/video.mxf differ
index 0e40e455fcf46b13c6c74ef679d7e3a89a67ac59..f41b136643007e030ec96a32e2a311886e29d00a 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AssetMap xmlns="http://www.digicine.com/PROTO-ASDCP-AM-20040311#">
-  <Id>urn:uuid:5d51e8a1-b2a5-4da6-9b66-4615c3609440</Id>
+  <Id>urn:uuid:017b3de4-6dda-408d-b19b-6711354b0bc3</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:6af1e0c1-c441-47f8-a502-3efd46b1fa4f</Id>
+      <Id>urn:uuid:d199d58b-5ef8-4d49-b270-07e590ccb280</Id>
       <PackingList>true</PackingList>
       <ChunkList>
         <Chunk>
-          <Path>pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml</Path>
+          <Path>pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1253</Length>
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
+      <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
       <ChunkList>
         <Chunk>
-          <Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path>
+          <Path>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1965</Length>
@@ -31,7 +31,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
+      <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
       <ChunkList>
         <Chunk>
           <Path>video.mxf</Path>
@@ -42,7 +42,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id>
+      <Id>urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa</Id>
       <ChunkList>
         <Chunk>
           <Path>audio.mxf</Path>
index f095f00aacdfb89c3d224a3a17b2ea307a24b786..5e08f74f86b8b05b36fffb5eb52a9b0300621fd3 100644 (file)
Binary files a/test/ref/DCP/dcp_test7/audio.mxf and b/test/ref/DCP/dcp_test7/audio.mxf differ
diff --git a/test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
new file mode 100644 (file)
index 0000000..b73ef84
--- /dev/null
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompositionPlaylist xmlns="http://www.digicine.com/PROTO-ASDCP-CPL-20040511#">
+  <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>trailer</ContentKind>
+  <ContentVersion>
+    <Id>urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11</Id>
+    <LabelText>content-version-label-text</LabelText>
+  </ContentVersion>
+  <RatingList/>
+  <ReelList>
+    <Reel>
+      <Id>urn:uuid:d1102bfd-65c2-465c-ab33-200ace46fcf5</Id>
+      <AssetList>
+        <MainMarkers>
+          <Id>urn:uuid:3b198cbc-c1d2-4410-805c-397b6fea0297</Id>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <MarkerList>
+            <Marker>
+              <Label>FFOC</Label>
+              <Offset>1</Offset>
+            </Marker>
+            <Marker>
+              <Label>LFOC</Label>
+              <Offset>23</Offset>
+            </Marker>
+          </MarkerList>
+        </MainMarkers>
+        <MainPicture>
+          <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>24</Duration>
+          <Hash>wUmt8G+cFFKMGt0ueS9+F1S4uhc=</Hash>
+          <FrameRate>24 1</FrameRate>
+          <ScreenAspectRatio>1.85</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>KcJb7S2K5cNm8RG4kfQD5FTeS0A=</Hash>
+        </MainSound>
+      </AssetList>
+    </Reel>
+  </ReelList>
+</CompositionPlaylist>
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
deleted file mode 100644 (file)
index 58e5897..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.digicine.com/PROTO-ASDCP-CPL-20040511#">
-  <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</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>trailer</ContentKind>
-  <ContentVersion>
-    <Id>urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11</Id>
-    <LabelText>content-version-label-text</LabelText>
-  </ContentVersion>
-  <RatingList/>
-  <ReelList>
-    <Reel>
-      <Id>urn:uuid:793170e7-e913-404b-8942-1c7f2e5cf012</Id>
-      <AssetList>
-        <MainMarkers>
-          <Id>urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff</Id>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <MarkerList>
-            <Marker>
-              <Label>FFOC</Label>
-              <Offset>1</Offset>
-            </Marker>
-            <Marker>
-              <Label>LFOC</Label>
-              <Offset>23</Offset>
-            </Marker>
-          </MarkerList>
-        </MainMarkers>
-        <MainPicture>
-          <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <Hash>gVKhC9IkWyzQbgzpFcJ1bpqbtwk=</Hash>
-          <FrameRate>24 1</FrameRate>
-          <ScreenAspectRatio>1.85</ScreenAspectRatio>
-        </MainPicture>
-        <MainSound>
-          <Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <Hash>Lq7ot/GobgrqUYdlbR8FCD5APqs=</Hash>
-        </MainSound>
-      </AssetList>
-    </Reel>
-  </ReelList>
-</CompositionPlaylist>
diff --git a/test/ref/DCP/dcp_test7/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml b/test/ref/DCP/dcp_test7/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml
deleted file mode 100644 (file)
index c8190a2..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#">
-  <Id>urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f</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:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
-      <AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
-      <Hash>V/3WP9Ff60ZtDhisE5onL9wo2tY=</Hash>
-      <Size>1965</Size>
-      <Type>text/xml;asdcpKind=CPL</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
-      <AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText>
-      <Hash>gVKhC9IkWyzQbgzpFcJ1bpqbtwk=</Hash>
-      <Size>49240</Size>
-      <Type>application/x-smpte-mxf;asdcpKind=Picture</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id>
-      <AnnotationText>8b92bcee-62fc-4a33-a51a-816e9611ce85</AnnotationText>
-      <Hash>Lq7ot/GobgrqUYdlbR8FCD5APqs=</Hash>
-      <Size>881326</Size>
-      <Type>application/x-smpte-mxf;asdcpKind=Sound</Type>
-    </Asset>
-  </AssetList>
-</PackingList>
diff --git a/test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml b/test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
new file mode 100644 (file)
index 0000000..20bad65
--- /dev/null
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#">
+  <Id>urn:uuid:d199d58b-5ef8-4d49-b270-07e590ccb280</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>Vsre14v3AhK6X2gUzeYF9G8GKo0=</Hash>
+      <Size>1965</Size>
+      <Type>text/xml;asdcpKind=CPL</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
+      <AnnotationText>5407b210-4441-4e97-8b16-8bdc7c12da54</AnnotationText>
+      <Hash>wUmt8G+cFFKMGt0ueS9+F1S4uhc=</Hash>
+      <Size>49240</Size>
+      <Type>application/x-smpte-mxf;asdcpKind=Picture</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa</Id>
+      <AnnotationText>97f0f352-5b77-48ee-a558-9df37717f4fa</AnnotationText>
+      <Hash>KcJb7S2K5cNm8RG4kfQD5FTeS0A=</Hash>
+      <Size>881326</Size>
+      <Type>application/x-smpte-mxf;asdcpKind=Sound</Type>
+    </Asset>
+  </AssetList>
+</PackingList>
index 4ff8e3b3bb108a43dff54e5aac9a3fadf252f9ff..27ba41cf867b1fb91847a4d6057e0c9aa74a58b0 100644 (file)
Binary files a/test/ref/DCP/dcp_test7/video.mxf and b/test/ref/DCP/dcp_test7/video.mxf differ
index 71fa54ac57b88e0251a1addaa2357cb5b5afa986..2b762d37d39c0370d3741f936e3fa4faa11506bc 100644 (file)
@@ -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:e5c3091b-f61e-459c-9faf-210bd4d3c7bf</Id>
+  <Id>urn:uuid:460be38d-d560-455c-ad57-b2e80ca9b228</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:8ee8f7da-8da2-4adb-ae0e-31e8f4b91900</Id>
+      <Id>urn:uuid:93887017-5d6a-4ee5-b5f4-161b06281d0e</Id>
       <PackingList>true</PackingList>
       <ChunkList>
         <Chunk>
-          <Path>pkl_8ee8f7da-8da2-4adb-ae0e-31e8f4b91900.xml</Path>
+          <Path>pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>8708</Length>
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
+      <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
       <ChunkList>
         <Chunk>
-          <Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path>
+          <Path>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>9226</Length>
@@ -31,7 +31,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:e98d059d-645f-4343-a30f-edc61d58b8e0</Id>
+      <Id>urn:uuid:9a7fbb03-4078-4944-90b1-0d8a21c9d793</Id>
       <ChunkList>
         <Chunk>
           <Path>video.mxf</Path>
@@ -42,7 +42,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:11471a77-7cd8-4de6-8c11-beaa198c015f</Id>
+      <Id>urn:uuid:ce300880-a425-40a6-adac-eb1e3f5643fc</Id>
       <ChunkList>
         <Chunk>
           <Path>audio.mxf</Path>
index 1b6eb33c9ca624291ba338a55d35ba5dc2c59817..61839db4fe1f7a66640a6ad9e075cad5f451b7b9 100644 (file)
Binary files a/test/ref/DCP/encryption_test/audio.mxf and b/test/ref/DCP/encryption_test/audio.mxf 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
new file mode 100644 (file)
index 0000000..2043a07
--- /dev/null
@@ -0,0 +1,163 @@
+<?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:c1d35c2a-39c5-46b8-bbeb-7a1cdffff013</Id>
+      <AssetList>
+        <MainPicture>
+          <Id>urn:uuid:9a7fbb03-4078-4944-90b1-0d8a21c9d793</Id>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>24</Duration>
+          <KeyId>urn:uuid:ac8d301c-e5d9-4343-b6f3-ba2668adbe56</KeyId>
+          <Hash>8r+Gnfyg5fxetQxyddD7fjzH3Qo=</Hash>
+          <FrameRate>24 1</FrameRate>
+          <ScreenAspectRatio>1998 1080</ScreenAspectRatio>
+        </MainPicture>
+        <MainSound>
+          <Id>urn:uuid:ce300880-a425-40a6-adac-eb1e3f5643fc</Id>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>24</Duration>
+          <KeyId>urn:uuid:7ab6c77b-6648-44b9-8549-a5290ada6238</KeyId>
+          <Hash>lS+FKcwLD7cRjgZMQ+hvGg/yJIc=</Hash>
+        </MainSound>
+      </AssetList>
+    </Reel>
+  </ReelList>
+  <Signer xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+    <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 xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+    <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>0FHIG9HMW/Sp8GfYHLV0p86GCWY=</dsig:DigestValue>
+      </dsig:Reference>
+    </dsig:SignedInfo>
+    <dsig:SignatureValue>tk/wncwRngGXR2towgLMj+3Odk6pbPQtvcYTnILFu2M15IN6Iau3SiNW+2TBYRMK
+zuNVKBxYX2Q0Hk5znioC8q/GHpN1NWV+oglEaAJmqkmTX/KL2gIrfZCQsL7wQ5DE
+7wHq4URRO24Q+K1DnnyXBe70WugikvkJI7iFqWN+qjEPebP8lBbOUKVcCpqcUgIC
+7Omb2/W9Nx/7NZv3F1vTctna20rZnVHp86bccHrlUvGVbGs9svEPuPKEjBQlym3z
+SU5nyTIZ7NMM27QE9lQ8O/LUMoP2pLtc7eNnEnNzLkIZGXoDOBu2KELtDQjojqIk
+8QnEQSXk9FpUVNaGl3gruw==</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
+NTA1MzExMzIwMDhaMIGEMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UECxML
+ZXhhbXBsZS5vcmcxLzAtBgNVBAMUJkNTLnNtcHRlLTQzMC0yLkxFQUYuTk9UX0ZP
+Ul9QUk9EVUNUSU9OMSUwIwYDVQQuExxRRlZseW03ZnVxbDZiUE9uWTM4YWFPMVpQ
+VzQ9MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA08vRdRvUh31Oi96E
+GHqfmYs2GhxKS7Y1AJpVGjPWQyZFYkwspzG9voK6rMbnXEQ5HRDJ0jZ5DaxS7zrm
+YIOsX6DQpl2kY8MTHXmWZFg623HID+XAowFqkTG7UtUpXsZ/vj+gOKu0PQPmdRLM
+Rg5Hs2yQxSS7/SizuG52CrAmsIeab9u/AOL10uLRmUBzLMaXt4uPz2i+3PXi+uVu
+lfy3tEQ3+QRNNsH2G6O6sURR+4nYB0cLLlINpHTdBixfGU/Eb9g/wpD3zrGcAV6Z
+XvxULNd4RcxH8Ys15QuvtdMGwW/8LW1/03WO5XeQRkcoPF44yV4XUeTE5weXYAaM
+ZH7hMwIDAQABo4HvMIHsMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMB0GA1Ud
+DgQWBBRAVWXKbt+6qXps86djfxpo7Vk9bjCBrwYDVR0jBIGnMIGkgBTp5q3yvfdR
+LvVq+5ASiOYf5uOTzqGBiKSBhTCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDAS
+BgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5O
+T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dN
+VkFMRlNlYz2CAQYwDQYJKoZIhvcNAQELBQADggEBAA4CsCDn8UKBcH7wroorNKbf
+ZVzwGSxNyCMTmDm38ZmriNpV7FCNTLek4xmf21ITafC9nNxpbWA7l9bG5dRnktwa
+JSlHZKDKKVEUHJYu/47YUlmt4YNVo+zN0iB/QLXoHu6yGw3/N7z4sBDyLGGPl5mh
+sAxuXpFr1ruTQVqx483L7ie/p0GV9vsoAJQTRTnIcvEs7rVHxIWEsiOE8AZozW72
+jIBKSy9jsxSGYgmMgbdkrs5c2hBvVim5i58PIzSCo/lI/5WRREESZIyZ9zIBSwIS
+cYueAupiCrOxzY6Xg3GZlMbbHElp4MnDeV3zv90UAuZXomorCOcnutqUe36J63E=</dsig:X509Certificate>
+      </dsig:X509Data>
+      <dsig:X509Data>
+        <dsig:X509IssuerSerial>
+          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+          <dsig:X509SerialNumber>6</dsig:X509SerialNumber>
+        </dsig:X509IssuerSerial>
+        <dsig:X509Certificate>MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
+bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
+NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
+Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAxMTMy
+MDA4WjCBijEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
+b3JnMTUwMwYDVQQDFCwuc21wdGUtNDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1Jf
+UFJPRFVDVElPTjElMCMGA1UELhMcNmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0
+PTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjv758HrPTeThATXaFU
+JCyUlGbLxETJQ2lqXx5a9XL/FDNsMN11IZ9hhUfj/KV2aNDYJ2nsaInAeZ00kNgG
+OOPAqF0KainrO4vlYQB10nwcmfvI/BtqW4GFXBDYpIXvyF7ss4e4Zp52h+UVkfTY
+Dwf10W7vP8Gr1wKaIvFsuGbB35D3PfX+4lacF2cNMFSHLj+oiLug5vOpoo/QTS+o
+gBl2mGctSLaEBE9x/HO10Dy7WXrUpokPGcHhJzwOlbAnVt6X4kANVATf5ffy0UQE
+uROgsSUm+hK/HqmUXTE6Gy7Hi7sktdI6X3EnBdzse1vxNQTrKy6bMXswcgOkklnk
+5AECAwEAAaOB9TCB8jASBgNVHRMBAf8ECDAGAQH/AgECMAsGA1UdDwQEAwIBBjAd
+BgNVHQ4EFgQU6eat8r33US71avuQEojmH+bjk84wga8GA1UdIwSBpzCBpIAUDCnR
+dHFbcv4ANVUq2+wMVALFSeehgYikgYUwgYIxFDASBgNVBAoTC2V4YW1wbGUub3Jn
+MRQwEgYDVQQLEwtleGFtcGxlLm9yZzEtMCsGA1UEAxQkLnNtcHRlLTQzMC0yLlJP
+T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxEQ25SZEhGYmN2NEFOVlVx
+Mit3TVZBTEZTZWM9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQBGr/uVKvBE7yGcPdOG
+AaacD8zmEkb8BL+otrumW1BqAI0BIVghvuTDAKtk/cFy7Mbnnp/mTJ6h5F7lDON4
+YVBQ9gouw5+pLM61r/ZTF+shiWA4C4cwWb1X/gw82TXD2wXch9IJmcblrfrabHkB
+Y3wyyn5unqHm+uy/ZsNzoTmRcrxnPua5DyZKxGBHV0TEDzJMUMgluRcQwRs0HmG1
+vWeROkXRWyYiY2QAdpINuQUKUqjtFTtOGcA3I/Hd7vUiqqxNr9fL0H/HDvAbEmIw
++YSFJ9uFyESvls8Lv5tydwhnqJBIKk19/CDIwMAPZnyT1WT3XwnD5hVRYljpgjm5
+xwd0</dsig:X509Certificate>
+      </dsig:X509Data>
+      <dsig:X509Data>
+        <dsig:X509IssuerSerial>
+          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+          <dsig:X509SerialNumber>5</dsig:X509SerialNumber>
+        </dsig:X509IssuerSerial>
+        <dsig:X509Certificate>MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
+bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
+NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
+Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAyMTMy
+MDA4WjCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
+b3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJ
+T04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dNVkFMRlNlYz0wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQdNLi0U0p9kkfszAymkW4fVTqG4KZ
+qNlO43eE4+ItjTr0qDEvyyq94tp2w1/7aag87Nzb386ibqFzldEt3u8xy9CXanUy
+Fg2vRzAJ+WgngmK8AdzHqdPzYTtIdMNj0GQkF+ze0VLM1QfAGUvsRzcqYJADD9om
+vsOnZiub92ezbL5swLaLpZq10i2HGYqDZxKlcslmaVXPgh7acmI9b3ledpLjOtvR
+NPI6tfy8jhjvCZY81+V5iZqyKTezrLTqqgNBlFjzIdCT1BRlbOlS55iOloRK8q9F
+TXqV6M1jqN6T4FlKzorjYWNEKp1V58DHBosAB0FXs+Sc10WWTuqL9Q3VAgMBAAGj
+gfUwgfIwEgYDVR0TAQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYE
+FAwp0XRxW3L+ADVVKtvsDFQCxUnnMIGvBgNVHSMEgacwgaSAFAwp0XRxW3L+ADVV
+KtvsDFQCxUnnoYGIpIGFMIGCMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UE
+CxMLZXhhbXBsZS5vcmcxLTArBgNVBAMUJC5zbXB0ZS00MzAtMi5ST09ULk5PVF9G
+T1JfUFJPRFVDVElPTjElMCMGA1UELhMcRENuUmRIRmJjdjRBTlZVcTIrd01WQUxG
+U2VjPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAEOGcZTz1XGfZunxCnclrNDDsgLhy
+RvqxG7Li7enVyKF5798ckA17jCnkY/W9YwtjpgfEpjw9aGdCy6cviNu51jT5F9qg
+y0O2OXhtX47aS9G6r1m50cBmrciBxrqSTr6/co6jcRImRhTpvVcLcbv3emCLogBw
+9v93abXvbT+GZ6yc2OOArTZCFlrLW8XTDSDrPp/hida2NjZOrxJj6iFEh6+M+S7Z
+T/bwFNfuPDsDhtccoVt/hIM0imFnjKlwbo3HbJ3v+Lhy2oUS66d5ELHuuQnMuKFT
+pxf6/gl42q4gFbwBDp6jxy5L1J4LZGZIwsoTv6dFjo1MNttqmfMTheiwpQ==</dsig:X509Certificate>
+      </dsig:X509Data>
+    </dsig:KeyInfo>
+  </dsig:Signature>
+</CompositionPlaylist>
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
deleted file mode 100644 (file)
index 2866df6..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL">
-  <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</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:627ad740-ae36-4c49-92bb-553a9f09c4f8</Id>
-      <AssetList>
-        <MainPicture>
-          <Id>urn:uuid:e98d059d-645f-4343-a30f-edc61d58b8e0</Id>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <KeyId>urn:uuid:e94b8a0d-27f7-408a-af16-78d3df419a91</KeyId>
-          <Hash>GwEhpziCPkDM7vuFOzhy4Em0EOI=</Hash>
-          <FrameRate>24 1</FrameRate>
-          <ScreenAspectRatio>1998 1080</ScreenAspectRatio>
-        </MainPicture>
-        <MainSound>
-          <Id>urn:uuid:11471a77-7cd8-4de6-8c11-beaa198c015f</Id>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <KeyId>urn:uuid:a4f49b5e-622f-45f3-8ba7-63ce1fd40e78</KeyId>
-          <Hash>MSuGS6IIIQKGHR626+XAUbJj1zY=</Hash>
-        </MainSound>
-      </AssetList>
-    </Reel>
-  </ReelList>
-  <Signer xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-    <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 xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-    <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>4/8QgoO0blTh31eQ8ubu1zkECYc=</dsig:DigestValue>
-      </dsig:Reference>
-    </dsig:SignedInfo>
-    <dsig:SignatureValue>jHGd0G9X7iT26LNertFIPsKGIVUxUNEZWSDmjzYH4QwP2SAYOMh/tGXAaUQyy2vA
-+qCj+OQavpBS8q1HMekyUrShRo18XY6mpS3lSADdZBY7TLExCdkLtSq7yoPVfzx+
-+iRypVIKBl6xbv9wf/ssCzpxXMbsuaL5BGbOdRlgH7FFdQN5GKbAWVYoCmPHcl+q
-S2BLqXN1S9LjB4zQ606bVq2C4S7mUYqAFZ0a9w/MK1RU5kFRJfq7W2ZktvhIWrFI
-K6iF4XGhwoCURfPKP9piAwrpR+5sI7LuknMLa/JHPYzkBCH63oZoNW8vHyzCBNpR
-ADgG10jZGAXp+GY0BL8v2w==</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
-NTA1MzExMzIwMDhaMIGEMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UECxML
-ZXhhbXBsZS5vcmcxLzAtBgNVBAMUJkNTLnNtcHRlLTQzMC0yLkxFQUYuTk9UX0ZP
-Ul9QUk9EVUNUSU9OMSUwIwYDVQQuExxRRlZseW03ZnVxbDZiUE9uWTM4YWFPMVpQ
-VzQ9MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA08vRdRvUh31Oi96E
-GHqfmYs2GhxKS7Y1AJpVGjPWQyZFYkwspzG9voK6rMbnXEQ5HRDJ0jZ5DaxS7zrm
-YIOsX6DQpl2kY8MTHXmWZFg623HID+XAowFqkTG7UtUpXsZ/vj+gOKu0PQPmdRLM
-Rg5Hs2yQxSS7/SizuG52CrAmsIeab9u/AOL10uLRmUBzLMaXt4uPz2i+3PXi+uVu
-lfy3tEQ3+QRNNsH2G6O6sURR+4nYB0cLLlINpHTdBixfGU/Eb9g/wpD3zrGcAV6Z
-XvxULNd4RcxH8Ys15QuvtdMGwW/8LW1/03WO5XeQRkcoPF44yV4XUeTE5weXYAaM
-ZH7hMwIDAQABo4HvMIHsMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMB0GA1Ud
-DgQWBBRAVWXKbt+6qXps86djfxpo7Vk9bjCBrwYDVR0jBIGnMIGkgBTp5q3yvfdR
-LvVq+5ASiOYf5uOTzqGBiKSBhTCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDAS
-BgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5O
-T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dN
-VkFMRlNlYz2CAQYwDQYJKoZIhvcNAQELBQADggEBAA4CsCDn8UKBcH7wroorNKbf
-ZVzwGSxNyCMTmDm38ZmriNpV7FCNTLek4xmf21ITafC9nNxpbWA7l9bG5dRnktwa
-JSlHZKDKKVEUHJYu/47YUlmt4YNVo+zN0iB/QLXoHu6yGw3/N7z4sBDyLGGPl5mh
-sAxuXpFr1ruTQVqx483L7ie/p0GV9vsoAJQTRTnIcvEs7rVHxIWEsiOE8AZozW72
-jIBKSy9jsxSGYgmMgbdkrs5c2hBvVim5i58PIzSCo/lI/5WRREESZIyZ9zIBSwIS
-cYueAupiCrOxzY6Xg3GZlMbbHElp4MnDeV3zv90UAuZXomorCOcnutqUe36J63E=</dsig:X509Certificate>
-      </dsig:X509Data>
-      <dsig:X509Data>
-        <dsig:X509IssuerSerial>
-          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
-          <dsig:X509SerialNumber>6</dsig:X509SerialNumber>
-        </dsig:X509IssuerSerial>
-        <dsig:X509Certificate>MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
-Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAxMTMy
-MDA4WjCBijEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMTUwMwYDVQQDFCwuc21wdGUtNDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1Jf
-UFJPRFVDVElPTjElMCMGA1UELhMcNmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0
-PTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjv758HrPTeThATXaFU
-JCyUlGbLxETJQ2lqXx5a9XL/FDNsMN11IZ9hhUfj/KV2aNDYJ2nsaInAeZ00kNgG
-OOPAqF0KainrO4vlYQB10nwcmfvI/BtqW4GFXBDYpIXvyF7ss4e4Zp52h+UVkfTY
-Dwf10W7vP8Gr1wKaIvFsuGbB35D3PfX+4lacF2cNMFSHLj+oiLug5vOpoo/QTS+o
-gBl2mGctSLaEBE9x/HO10Dy7WXrUpokPGcHhJzwOlbAnVt6X4kANVATf5ffy0UQE
-uROgsSUm+hK/HqmUXTE6Gy7Hi7sktdI6X3EnBdzse1vxNQTrKy6bMXswcgOkklnk
-5AECAwEAAaOB9TCB8jASBgNVHRMBAf8ECDAGAQH/AgECMAsGA1UdDwQEAwIBBjAd
-BgNVHQ4EFgQU6eat8r33US71avuQEojmH+bjk84wga8GA1UdIwSBpzCBpIAUDCnR
-dHFbcv4ANVUq2+wMVALFSeehgYikgYUwgYIxFDASBgNVBAoTC2V4YW1wbGUub3Jn
-MRQwEgYDVQQLEwtleGFtcGxlLm9yZzEtMCsGA1UEAxQkLnNtcHRlLTQzMC0yLlJP
-T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxEQ25SZEhGYmN2NEFOVlVx
-Mit3TVZBTEZTZWM9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQBGr/uVKvBE7yGcPdOG
-AaacD8zmEkb8BL+otrumW1BqAI0BIVghvuTDAKtk/cFy7Mbnnp/mTJ6h5F7lDON4
-YVBQ9gouw5+pLM61r/ZTF+shiWA4C4cwWb1X/gw82TXD2wXch9IJmcblrfrabHkB
-Y3wyyn5unqHm+uy/ZsNzoTmRcrxnPua5DyZKxGBHV0TEDzJMUMgluRcQwRs0HmG1
-vWeROkXRWyYiY2QAdpINuQUKUqjtFTtOGcA3I/Hd7vUiqqxNr9fL0H/HDvAbEmIw
-+YSFJ9uFyESvls8Lv5tydwhnqJBIKk19/CDIwMAPZnyT1WT3XwnD5hVRYljpgjm5
-xwd0</dsig:X509Certificate>
-      </dsig:X509Data>
-      <dsig:X509Data>
-        <dsig:X509IssuerSerial>
-          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
-          <dsig:X509SerialNumber>5</dsig:X509SerialNumber>
-        </dsig:X509IssuerSerial>
-        <dsig:X509Certificate>MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
-Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAyMTMy
-MDA4WjCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJ
-T04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dNVkFMRlNlYz0wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQdNLi0U0p9kkfszAymkW4fVTqG4KZ
-qNlO43eE4+ItjTr0qDEvyyq94tp2w1/7aag87Nzb386ibqFzldEt3u8xy9CXanUy
-Fg2vRzAJ+WgngmK8AdzHqdPzYTtIdMNj0GQkF+ze0VLM1QfAGUvsRzcqYJADD9om
-vsOnZiub92ezbL5swLaLpZq10i2HGYqDZxKlcslmaVXPgh7acmI9b3ledpLjOtvR
-NPI6tfy8jhjvCZY81+V5iZqyKTezrLTqqgNBlFjzIdCT1BRlbOlS55iOloRK8q9F
-TXqV6M1jqN6T4FlKzorjYWNEKp1V58DHBosAB0FXs+Sc10WWTuqL9Q3VAgMBAAGj
-gfUwgfIwEgYDVR0TAQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYE
-FAwp0XRxW3L+ADVVKtvsDFQCxUnnMIGvBgNVHSMEgacwgaSAFAwp0XRxW3L+ADVV
-KtvsDFQCxUnnoYGIpIGFMIGCMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UE
-CxMLZXhhbXBsZS5vcmcxLTArBgNVBAMUJC5zbXB0ZS00MzAtMi5ST09ULk5PVF9G
-T1JfUFJPRFVDVElPTjElMCMGA1UELhMcRENuUmRIRmJjdjRBTlZVcTIrd01WQUxG
-U2VjPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAEOGcZTz1XGfZunxCnclrNDDsgLhy
-RvqxG7Li7enVyKF5798ckA17jCnkY/W9YwtjpgfEpjw9aGdCy6cviNu51jT5F9qg
-y0O2OXhtX47aS9G6r1m50cBmrciBxrqSTr6/co6jcRImRhTpvVcLcbv3emCLogBw
-9v93abXvbT+GZ6yc2OOArTZCFlrLW8XTDSDrPp/hida2NjZOrxJj6iFEh6+M+S7Z
-T/bwFNfuPDsDhtccoVt/hIM0imFnjKlwbo3HbJ3v+Lhy2oUS66d5ELHuuQnMuKFT
-pxf6/gl42q4gFbwBDp6jxy5L1J4LZGZIwsoTv6dFjo1MNttqmfMTheiwpQ==</dsig:X509Certificate>
-      </dsig:X509Data>
-    </dsig:KeyInfo>
-  </dsig:Signature>
-</CompositionPlaylist>
diff --git a/test/ref/DCP/encryption_test/pkl_8ee8f7da-8da2-4adb-ae0e-31e8f4b91900.xml b/test/ref/DCP/encryption_test/pkl_8ee8f7da-8da2-4adb-ae0e-31e8f4b91900.xml
deleted file mode 100644 (file)
index b97d6ea..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL">
-  <Id>urn:uuid:8ee8f7da-8da2-4adb-ae0e-31e8f4b91900</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:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
-      <AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
-      <Hash>zk4L2kXj9llDdjmxCW2d2X06VQM=</Hash>
-      <Size>9226</Size>
-      <Type>text/xml</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:e98d059d-645f-4343-a30f-edc61d58b8e0</Id>
-      <AnnotationText>e98d059d-645f-4343-a30f-edc61d58b8e0</AnnotationText>
-      <Hash>GwEhpziCPkDM7vuFOzhy4Em0EOI=</Hash>
-      <Size>44032</Size>
-      <Type>application/mxf</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:11471a77-7cd8-4de6-8c11-beaa198c015f</Id>
-      <AnnotationText>11471a77-7cd8-4de6-8c11-beaa198c015f</AnnotationText>
-      <Hash>MSuGS6IIIQKGHR626+XAUbJj1zY=</Hash>
-      <Size>165454</Size>
-      <Type>application/mxf</Type>
-    </Asset>
-  </AssetList>
-  <Signer xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-    <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 xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-    <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>xzO3cFwUX87TL4rL9jq6CLqDN6I=</dsig:DigestValue>
-      </dsig:Reference>
-    </dsig:SignedInfo>
-    <dsig:SignatureValue>VIZyD5JmV2gnPyzMEMwDaIg+NBOZzpSvBoRtPbWrYUyjxVzQfPvFzAAE+4hz8Wc7
-TIpiTZ3sYXKRQAEmA4Iu5AOJ2uijv8tnioo2FyV6JT9aGr5cNi7eeGFmN7ILU4zc
-rgp99iWgTRms8T8C7zy/NtE8P2q8K4sxQvxnYmK/0kHkQPQnWpZafAd6G/fpoV0h
-5W8UQTtn72OEPhm21uxp4crWRk9YlF2ayGYDBGm8YFP01w663e0r61xq6ROW2O4i
-jR2dQWPM1nzrafHSJKg2TL4S/GtTsDNNuIJihzGpmEjULX2FIt83f6dogyr7K624
-XcjpahE+WHn7WR3VVZsMkw==</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
-NTA1MzExMzIwMDhaMIGEMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UECxML
-ZXhhbXBsZS5vcmcxLzAtBgNVBAMUJkNTLnNtcHRlLTQzMC0yLkxFQUYuTk9UX0ZP
-Ul9QUk9EVUNUSU9OMSUwIwYDVQQuExxRRlZseW03ZnVxbDZiUE9uWTM4YWFPMVpQ
-VzQ9MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA08vRdRvUh31Oi96E
-GHqfmYs2GhxKS7Y1AJpVGjPWQyZFYkwspzG9voK6rMbnXEQ5HRDJ0jZ5DaxS7zrm
-YIOsX6DQpl2kY8MTHXmWZFg623HID+XAowFqkTG7UtUpXsZ/vj+gOKu0PQPmdRLM
-Rg5Hs2yQxSS7/SizuG52CrAmsIeab9u/AOL10uLRmUBzLMaXt4uPz2i+3PXi+uVu
-lfy3tEQ3+QRNNsH2G6O6sURR+4nYB0cLLlINpHTdBixfGU/Eb9g/wpD3zrGcAV6Z
-XvxULNd4RcxH8Ys15QuvtdMGwW/8LW1/03WO5XeQRkcoPF44yV4XUeTE5weXYAaM
-ZH7hMwIDAQABo4HvMIHsMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMB0GA1Ud
-DgQWBBRAVWXKbt+6qXps86djfxpo7Vk9bjCBrwYDVR0jBIGnMIGkgBTp5q3yvfdR
-LvVq+5ASiOYf5uOTzqGBiKSBhTCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDAS
-BgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5O
-T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dN
-VkFMRlNlYz2CAQYwDQYJKoZIhvcNAQELBQADggEBAA4CsCDn8UKBcH7wroorNKbf
-ZVzwGSxNyCMTmDm38ZmriNpV7FCNTLek4xmf21ITafC9nNxpbWA7l9bG5dRnktwa
-JSlHZKDKKVEUHJYu/47YUlmt4YNVo+zN0iB/QLXoHu6yGw3/N7z4sBDyLGGPl5mh
-sAxuXpFr1ruTQVqx483L7ie/p0GV9vsoAJQTRTnIcvEs7rVHxIWEsiOE8AZozW72
-jIBKSy9jsxSGYgmMgbdkrs5c2hBvVim5i58PIzSCo/lI/5WRREESZIyZ9zIBSwIS
-cYueAupiCrOxzY6Xg3GZlMbbHElp4MnDeV3zv90UAuZXomorCOcnutqUe36J63E=</dsig:X509Certificate>
-      </dsig:X509Data>
-      <dsig:X509Data>
-        <dsig:X509IssuerSerial>
-          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
-          <dsig:X509SerialNumber>6</dsig:X509SerialNumber>
-        </dsig:X509IssuerSerial>
-        <dsig:X509Certificate>MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
-Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAxMTMy
-MDA4WjCBijEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMTUwMwYDVQQDFCwuc21wdGUtNDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1Jf
-UFJPRFVDVElPTjElMCMGA1UELhMcNmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0
-PTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjv758HrPTeThATXaFU
-JCyUlGbLxETJQ2lqXx5a9XL/FDNsMN11IZ9hhUfj/KV2aNDYJ2nsaInAeZ00kNgG
-OOPAqF0KainrO4vlYQB10nwcmfvI/BtqW4GFXBDYpIXvyF7ss4e4Zp52h+UVkfTY
-Dwf10W7vP8Gr1wKaIvFsuGbB35D3PfX+4lacF2cNMFSHLj+oiLug5vOpoo/QTS+o
-gBl2mGctSLaEBE9x/HO10Dy7WXrUpokPGcHhJzwOlbAnVt6X4kANVATf5ffy0UQE
-uROgsSUm+hK/HqmUXTE6Gy7Hi7sktdI6X3EnBdzse1vxNQTrKy6bMXswcgOkklnk
-5AECAwEAAaOB9TCB8jASBgNVHRMBAf8ECDAGAQH/AgECMAsGA1UdDwQEAwIBBjAd
-BgNVHQ4EFgQU6eat8r33US71avuQEojmH+bjk84wga8GA1UdIwSBpzCBpIAUDCnR
-dHFbcv4ANVUq2+wMVALFSeehgYikgYUwgYIxFDASBgNVBAoTC2V4YW1wbGUub3Jn
-MRQwEgYDVQQLEwtleGFtcGxlLm9yZzEtMCsGA1UEAxQkLnNtcHRlLTQzMC0yLlJP
-T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxEQ25SZEhGYmN2NEFOVlVx
-Mit3TVZBTEZTZWM9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQBGr/uVKvBE7yGcPdOG
-AaacD8zmEkb8BL+otrumW1BqAI0BIVghvuTDAKtk/cFy7Mbnnp/mTJ6h5F7lDON4
-YVBQ9gouw5+pLM61r/ZTF+shiWA4C4cwWb1X/gw82TXD2wXch9IJmcblrfrabHkB
-Y3wyyn5unqHm+uy/ZsNzoTmRcrxnPua5DyZKxGBHV0TEDzJMUMgluRcQwRs0HmG1
-vWeROkXRWyYiY2QAdpINuQUKUqjtFTtOGcA3I/Hd7vUiqqxNr9fL0H/HDvAbEmIw
-+YSFJ9uFyESvls8Lv5tydwhnqJBIKk19/CDIwMAPZnyT1WT3XwnD5hVRYljpgjm5
-xwd0</dsig:X509Certificate>
-      </dsig:X509Data>
-      <dsig:X509Data>
-        <dsig:X509IssuerSerial>
-          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
-          <dsig:X509SerialNumber>5</dsig:X509SerialNumber>
-        </dsig:X509IssuerSerial>
-        <dsig:X509Certificate>MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
-Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAyMTMy
-MDA4WjCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJ
-T04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dNVkFMRlNlYz0wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQdNLi0U0p9kkfszAymkW4fVTqG4KZ
-qNlO43eE4+ItjTr0qDEvyyq94tp2w1/7aag87Nzb386ibqFzldEt3u8xy9CXanUy
-Fg2vRzAJ+WgngmK8AdzHqdPzYTtIdMNj0GQkF+ze0VLM1QfAGUvsRzcqYJADD9om
-vsOnZiub92ezbL5swLaLpZq10i2HGYqDZxKlcslmaVXPgh7acmI9b3ledpLjOtvR
-NPI6tfy8jhjvCZY81+V5iZqyKTezrLTqqgNBlFjzIdCT1BRlbOlS55iOloRK8q9F
-TXqV6M1jqN6T4FlKzorjYWNEKp1V58DHBosAB0FXs+Sc10WWTuqL9Q3VAgMBAAGj
-gfUwgfIwEgYDVR0TAQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYE
-FAwp0XRxW3L+ADVVKtvsDFQCxUnnMIGvBgNVHSMEgacwgaSAFAwp0XRxW3L+ADVV
-KtvsDFQCxUnnoYGIpIGFMIGCMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UE
-CxMLZXhhbXBsZS5vcmcxLTArBgNVBAMUJC5zbXB0ZS00MzAtMi5ST09ULk5PVF9G
-T1JfUFJPRFVDVElPTjElMCMGA1UELhMcRENuUmRIRmJjdjRBTlZVcTIrd01WQUxG
-U2VjPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAEOGcZTz1XGfZunxCnclrNDDsgLhy
-RvqxG7Li7enVyKF5798ckA17jCnkY/W9YwtjpgfEpjw9aGdCy6cviNu51jT5F9qg
-y0O2OXhtX47aS9G6r1m50cBmrciBxrqSTr6/co6jcRImRhTpvVcLcbv3emCLogBw
-9v93abXvbT+GZ6yc2OOArTZCFlrLW8XTDSDrPp/hida2NjZOrxJj6iFEh6+M+S7Z
-T/bwFNfuPDsDhtccoVt/hIM0imFnjKlwbo3HbJ3v+Lhy2oUS66d5ELHuuQnMuKFT
-pxf6/gl42q4gFbwBDp6jxy5L1J4LZGZIwsoTv6dFjo1MNttqmfMTheiwpQ==</dsig:X509Certificate>
-      </dsig:X509Data>
-    </dsig:KeyInfo>
-  </dsig:Signature>
-</PackingList>
diff --git a/test/ref/DCP/encryption_test/pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml b/test/ref/DCP/encryption_test/pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml
new file mode 100644 (file)
index 0000000..c4bdfb7
--- /dev/null
@@ -0,0 +1,152 @@
+<?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>
+  <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>wktgMUem87F6zSpc33A4w1pW00Q=</Hash>
+      <Size>9226</Size>
+      <Type>text/xml</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:9a7fbb03-4078-4944-90b1-0d8a21c9d793</Id>
+      <AnnotationText>9a7fbb03-4078-4944-90b1-0d8a21c9d793</AnnotationText>
+      <Hash>8r+Gnfyg5fxetQxyddD7fjzH3Qo=</Hash>
+      <Size>44032</Size>
+      <Type>application/mxf</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:ce300880-a425-40a6-adac-eb1e3f5643fc</Id>
+      <AnnotationText>ce300880-a425-40a6-adac-eb1e3f5643fc</AnnotationText>
+      <Hash>lS+FKcwLD7cRjgZMQ+hvGg/yJIc=</Hash>
+      <Size>165454</Size>
+      <Type>application/mxf</Type>
+    </Asset>
+  </AssetList>
+  <Signer xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+    <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 xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+    <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>zxq+xgZYL/vhqtTzyFMZzWP0JDQ=</dsig:DigestValue>
+      </dsig:Reference>
+    </dsig:SignedInfo>
+    <dsig:SignatureValue>HifYYYkxSunbBcUYtUcIQDZf8kHcXhO7TnQWdnqQ4HxHKK3Man8jnNXXl0i5t8cO
+B9pHrBUQy1C50R/h2dW0B7cpeQLowX8UwJyl1yYoH62m/CIgDT/Zx4ji9M+Ogve9
+RS/SoXnMEeQotCQit3li9br5dW0hjptUn5ZDoyi+i4mpsjtuBQvPYymeFoey5oIV
+9DJXOS1uM/wSEbsDX6zyHOUW1l2jKVPyshulWoufc39QqcpuGDmnAY/zEHqMVBAm
++ycVhMI/Q8MlXggHNL1VYqWkplNAfElpbys1a/tMCFqpqk+BJ9IwMej5ypTASTKH
+sQH4u5vjsTvq8+X5SdD0qg==</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
+NTA1MzExMzIwMDhaMIGEMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UECxML
+ZXhhbXBsZS5vcmcxLzAtBgNVBAMUJkNTLnNtcHRlLTQzMC0yLkxFQUYuTk9UX0ZP
+Ul9QUk9EVUNUSU9OMSUwIwYDVQQuExxRRlZseW03ZnVxbDZiUE9uWTM4YWFPMVpQ
+VzQ9MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA08vRdRvUh31Oi96E
+GHqfmYs2GhxKS7Y1AJpVGjPWQyZFYkwspzG9voK6rMbnXEQ5HRDJ0jZ5DaxS7zrm
+YIOsX6DQpl2kY8MTHXmWZFg623HID+XAowFqkTG7UtUpXsZ/vj+gOKu0PQPmdRLM
+Rg5Hs2yQxSS7/SizuG52CrAmsIeab9u/AOL10uLRmUBzLMaXt4uPz2i+3PXi+uVu
+lfy3tEQ3+QRNNsH2G6O6sURR+4nYB0cLLlINpHTdBixfGU/Eb9g/wpD3zrGcAV6Z
+XvxULNd4RcxH8Ys15QuvtdMGwW/8LW1/03WO5XeQRkcoPF44yV4XUeTE5weXYAaM
+ZH7hMwIDAQABo4HvMIHsMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMB0GA1Ud
+DgQWBBRAVWXKbt+6qXps86djfxpo7Vk9bjCBrwYDVR0jBIGnMIGkgBTp5q3yvfdR
+LvVq+5ASiOYf5uOTzqGBiKSBhTCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDAS
+BgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5O
+T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dN
+VkFMRlNlYz2CAQYwDQYJKoZIhvcNAQELBQADggEBAA4CsCDn8UKBcH7wroorNKbf
+ZVzwGSxNyCMTmDm38ZmriNpV7FCNTLek4xmf21ITafC9nNxpbWA7l9bG5dRnktwa
+JSlHZKDKKVEUHJYu/47YUlmt4YNVo+zN0iB/QLXoHu6yGw3/N7z4sBDyLGGPl5mh
+sAxuXpFr1ruTQVqx483L7ie/p0GV9vsoAJQTRTnIcvEs7rVHxIWEsiOE8AZozW72
+jIBKSy9jsxSGYgmMgbdkrs5c2hBvVim5i58PIzSCo/lI/5WRREESZIyZ9zIBSwIS
+cYueAupiCrOxzY6Xg3GZlMbbHElp4MnDeV3zv90UAuZXomorCOcnutqUe36J63E=</dsig:X509Certificate>
+      </dsig:X509Data>
+      <dsig:X509Data>
+        <dsig:X509IssuerSerial>
+          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+          <dsig:X509SerialNumber>6</dsig:X509SerialNumber>
+        </dsig:X509IssuerSerial>
+        <dsig:X509Certificate>MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
+bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
+NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
+Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAxMTMy
+MDA4WjCBijEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
+b3JnMTUwMwYDVQQDFCwuc21wdGUtNDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1Jf
+UFJPRFVDVElPTjElMCMGA1UELhMcNmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0
+PTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjv758HrPTeThATXaFU
+JCyUlGbLxETJQ2lqXx5a9XL/FDNsMN11IZ9hhUfj/KV2aNDYJ2nsaInAeZ00kNgG
+OOPAqF0KainrO4vlYQB10nwcmfvI/BtqW4GFXBDYpIXvyF7ss4e4Zp52h+UVkfTY
+Dwf10W7vP8Gr1wKaIvFsuGbB35D3PfX+4lacF2cNMFSHLj+oiLug5vOpoo/QTS+o
+gBl2mGctSLaEBE9x/HO10Dy7WXrUpokPGcHhJzwOlbAnVt6X4kANVATf5ffy0UQE
+uROgsSUm+hK/HqmUXTE6Gy7Hi7sktdI6X3EnBdzse1vxNQTrKy6bMXswcgOkklnk
+5AECAwEAAaOB9TCB8jASBgNVHRMBAf8ECDAGAQH/AgECMAsGA1UdDwQEAwIBBjAd
+BgNVHQ4EFgQU6eat8r33US71avuQEojmH+bjk84wga8GA1UdIwSBpzCBpIAUDCnR
+dHFbcv4ANVUq2+wMVALFSeehgYikgYUwgYIxFDASBgNVBAoTC2V4YW1wbGUub3Jn
+MRQwEgYDVQQLEwtleGFtcGxlLm9yZzEtMCsGA1UEAxQkLnNtcHRlLTQzMC0yLlJP
+T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxEQ25SZEhGYmN2NEFOVlVx
+Mit3TVZBTEZTZWM9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQBGr/uVKvBE7yGcPdOG
+AaacD8zmEkb8BL+otrumW1BqAI0BIVghvuTDAKtk/cFy7Mbnnp/mTJ6h5F7lDON4
+YVBQ9gouw5+pLM61r/ZTF+shiWA4C4cwWb1X/gw82TXD2wXch9IJmcblrfrabHkB
+Y3wyyn5unqHm+uy/ZsNzoTmRcrxnPua5DyZKxGBHV0TEDzJMUMgluRcQwRs0HmG1
+vWeROkXRWyYiY2QAdpINuQUKUqjtFTtOGcA3I/Hd7vUiqqxNr9fL0H/HDvAbEmIw
++YSFJ9uFyESvls8Lv5tydwhnqJBIKk19/CDIwMAPZnyT1WT3XwnD5hVRYljpgjm5
+xwd0</dsig:X509Certificate>
+      </dsig:X509Data>
+      <dsig:X509Data>
+        <dsig:X509IssuerSerial>
+          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+          <dsig:X509SerialNumber>5</dsig:X509SerialNumber>
+        </dsig:X509IssuerSerial>
+        <dsig:X509Certificate>MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
+bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
+NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
+Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAyMTMy
+MDA4WjCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
+b3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJ
+T04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dNVkFMRlNlYz0wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQdNLi0U0p9kkfszAymkW4fVTqG4KZ
+qNlO43eE4+ItjTr0qDEvyyq94tp2w1/7aag87Nzb386ibqFzldEt3u8xy9CXanUy
+Fg2vRzAJ+WgngmK8AdzHqdPzYTtIdMNj0GQkF+ze0VLM1QfAGUvsRzcqYJADD9om
+vsOnZiub92ezbL5swLaLpZq10i2HGYqDZxKlcslmaVXPgh7acmI9b3ledpLjOtvR
+NPI6tfy8jhjvCZY81+V5iZqyKTezrLTqqgNBlFjzIdCT1BRlbOlS55iOloRK8q9F
+TXqV6M1jqN6T4FlKzorjYWNEKp1V58DHBosAB0FXs+Sc10WWTuqL9Q3VAgMBAAGj
+gfUwgfIwEgYDVR0TAQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYE
+FAwp0XRxW3L+ADVVKtvsDFQCxUnnMIGvBgNVHSMEgacwgaSAFAwp0XRxW3L+ADVV
+KtvsDFQCxUnnoYGIpIGFMIGCMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UE
+CxMLZXhhbXBsZS5vcmcxLTArBgNVBAMUJC5zbXB0ZS00MzAtMi5ST09ULk5PVF9G
+T1JfUFJPRFVDVElPTjElMCMGA1UELhMcRENuUmRIRmJjdjRBTlZVcTIrd01WQUxG
+U2VjPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAEOGcZTz1XGfZunxCnclrNDDsgLhy
+RvqxG7Li7enVyKF5798ckA17jCnkY/W9YwtjpgfEpjw9aGdCy6cviNu51jT5F9qg
+y0O2OXhtX47aS9G6r1m50cBmrciBxrqSTr6/co6jcRImRhTpvVcLcbv3emCLogBw
+9v93abXvbT+GZ6yc2OOArTZCFlrLW8XTDSDrPp/hida2NjZOrxJj6iFEh6+M+S7Z
+T/bwFNfuPDsDhtccoVt/hIM0imFnjKlwbo3HbJ3v+Lhy2oUS66d5ELHuuQnMuKFT
+pxf6/gl42q4gFbwBDp6jxy5L1J4LZGZIwsoTv6dFjo1MNttqmfMTheiwpQ==</dsig:X509Certificate>
+      </dsig:X509Data>
+    </dsig:KeyInfo>
+  </dsig:Signature>
+</PackingList>
index 5fe9a3203fb00dc164aea8281527784467e30001..7bad39eb4247b4554c1170695d59e611d9491643 100644 (file)
Binary files a/test/ref/DCP/encryption_test/video.mxf and b/test/ref/DCP/encryption_test/video.mxf differ
index 570b0d5b9edc6cd83c90cb60b96dda44858a1173..8dfb256d47cea8a8b615c5c7434e25699ec3d594 100644 (file)
@@ -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:b3062f87-9060-4848-a664-d864d1877f1c</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:ac8d301c-e5d9-4343-b6f3-ba2668adbe56</Id>
       <PackingList>true</PackingList>
       <ChunkList>
         <Chunk>
-          <Path>pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml</Path>
+          <Path>pkl_ac8d301c-e5d9-4343-b6f3-ba2668adbe56.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1114</Length>
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
+      <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
       <ChunkList>
         <Chunk>
-          <Path>cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml</Path>
+          <Path>cpl_5407b210-4441-4e97-8b16-8bdc7c12da54.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1061</Length>
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71</Id>
+      <Id>urn:uuid:dd015243-ab77-435c-a13d-690566885121</Id>
       <ChunkList>
         <Chunk>
-          <Path>d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png</Path>
+          <Path>dd015243-ab77-435c-a13d-690566885121.png</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>44861</Length>
diff --git a/test/ref/write_interop_subtitle_test3/cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml b/test/ref/write_interop_subtitle_test3/cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml
deleted file mode 100644 (file)
index 0d283b6..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.digicine.com/PROTO-ASDCP-CPL-20040511#">
-  <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>
-  <Creator>libdcp</Creator>
-  <ContentTitleText>My film</ContentTitleText>
-  <ContentKind>feature</ContentKind>
-  <ContentVersion>
-    <Id>urn:uuid:6a9e31a6-50a4-4ecb-8683-fa667848470a</Id>
-    <LabelText>foo</LabelText>
-  </ContentVersion>
-  <RatingList/>
-  <ReelList>
-    <Reel>
-      <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
-      <AssetList>
-        <MainSubtitle>
-          <Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>
-          <AnnotationText></AnnotationText>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>6046</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>6046</Duration>
-          <Hash>cVnFjMLTQnSIAlIzJpNB/p7B230=</Hash>
-        </MainSubtitle>
-      </AssetList>
-    </Reel>
-  </ReelList>
-</CompositionPlaylist>
diff --git a/test/ref/write_interop_subtitle_test3/cpl_5407b210-4441-4e97-8b16-8bdc7c12da54.xml b/test/ref/write_interop_subtitle_test3/cpl_5407b210-4441-4e97-8b16-8bdc7c12da54.xml
new file mode 100644 (file)
index 0000000..5bbf02e
--- /dev/null
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompositionPlaylist xmlns="http://www.digicine.com/PROTO-ASDCP-CPL-20040511#">
+  <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
+  <AnnotationText>Created by libdcp</AnnotationText>
+  <IssueDate>2018-09-02T04:45:18+00:00</IssueDate>
+  <Issuer>libdcp</Issuer>
+  <Creator>libdcp</Creator>
+  <ContentTitleText>My film</ContentTitleText>
+  <ContentKind>feature</ContentKind>
+  <ContentVersion>
+    <Id>urn:uuid:b365eeb5-dcdf-4aaf-83f0-1202fa5d3ca8</Id>
+    <LabelText>foo</LabelText>
+  </ContentVersion>
+  <RatingList/>
+  <ReelList>
+    <Reel>
+      <Id>urn:uuid:73e16051-f99a-4bf4-b96a-c432d32aa19f</Id>
+      <AssetList>
+        <MainSubtitle>
+          <Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>6046</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>6046</Duration>
+          <Hash>RmflhDu9QYUsNnBftdNlIEGdzG0=</Hash>
+        </MainSubtitle>
+      </AssetList>
+    </Reel>
+  </ReelList>
+</CompositionPlaylist>
diff --git a/test/ref/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png b/test/ref/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png
deleted file mode 100644 (file)
index 9d8f298..0000000
Binary files a/test/ref/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png and /dev/null differ
diff --git a/test/ref/write_interop_subtitle_test3/dd015243-ab77-435c-a13d-690566885121.png b/test/ref/write_interop_subtitle_test3/dd015243-ab77-435c-a13d-690566885121.png
new file mode 100644 (file)
index 0000000..9d8f298
Binary files /dev/null and b/test/ref/write_interop_subtitle_test3/dd015243-ab77-435c-a13d-690566885121.png differ
diff --git a/test/ref/write_interop_subtitle_test3/pkl_ac8d301c-e5d9-4343-b6f3-ba2668adbe56.xml b/test/ref/write_interop_subtitle_test3/pkl_ac8d301c-e5d9-4343-b6f3-ba2668adbe56.xml
new file mode 100644 (file)
index 0000000..362177c
--- /dev/null
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#">
+  <Id>urn:uuid:ac8d301c-e5d9-4343-b6f3-ba2668adbe56</Id>
+  <AnnotationText>Created by libdcp</AnnotationText>
+  <IssueDate>2018-09-02T04:45:18+00:00</IssueDate>
+  <Issuer>libdcp</Issuer>
+  <Creator>libdcp</Creator>
+  <AssetList>
+    <Asset>
+      <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
+      <AnnotationText>5407b210-4441-4e97-8b16-8bdc7c12da54</AnnotationText>
+      <Hash>M9U2kzcnfcBAy7MrXZGKjA8hQRU=</Hash>
+      <Size>1061</Size>
+      <Type>text/xml;asdcpKind=CPL</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>
+      <AnnotationText>a6c58cff-3e1e-4b38-acec-a42224475ef6</AnnotationText>
+      <Hash>RmflhDu9QYUsNnBftdNlIEGdzG0=</Hash>
+      <Size>438</Size>
+      <Type>text/xml;asdcpKind=Subtitle</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:dd015243-ab77-435c-a13d-690566885121</Id>
+      <Hash>2vTylSKQ5MCQHbKPT4X+rlwfHk4=</Hash>
+      <Size>44861</Size>
+      <Type>image/png</Type>
+    </Asset>
+  </AssetList>
+</PackingList>
diff --git a/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml b/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml
deleted file mode 100644 (file)
index 6f19225..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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>
-  <AnnotationText>Created by libdcp</AnnotationText>
-  <IssueDate>2018-09-02T04:45:18+00:00</IssueDate>
-  <Issuer>libdcp</Issuer>
-  <Creator>libdcp</Creator>
-  <AssetList>
-    <Asset>
-      <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
-      <AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText>
-      <Hash>Y8rZTMi93JjmkgwFK7Fu3W5rz/Y=</Hash>
-      <Size>1061</Size>
-      <Type>text/xml;asdcpKind=CPL</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>
-      <AnnotationText>a6c58cff-3e1e-4b38-acec-a42224475ef6</AnnotationText>
-      <Hash>ilLkOSjxgHZxkAdOPVJBoDFiUh8=</Hash>
-      <Size>438</Size>
-      <Type>text/xml;asdcpKind=Subtitle</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71</Id>
-      <Hash>2vTylSKQ5MCQHbKPT4X+rlwfHk4=</Hash>
-      <Size>44861</Size>
-      <Type>image/png</Type>
-    </Asset>
-  </AssetList>
-</PackingList>
index 050ee93053a39e6a5eefa2707b6cd549dea74382..7490130073a9917f806db58aeecd4aa406ecd864 100644 (file)
@@ -5,6 +5,6 @@
   <ReelNumber>1</ReelNumber>
   <Language>EN</Language>
   <Subtitle SpotNumber="1" TimeIn="00:04:09:229" TimeOut="00:04:11:229" FadeUpTime="0" FadeDownTime="0">
-    <Image VAlign="top" VPosition="80">d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png</Image>
+    <Image VAlign="top" VPosition="80">dd015243-ab77-435c-a13d-690566885121.png</Image>
   </Subtitle>
 </DCSubtitle>
index 38be998bb225395f093511b939d56262afad8b2f..20bef0fa436fe00e3bc0aa2bf6e97436957a73a7 100644 (file)
@@ -88,7 +88,7 @@ static string const dcp_test1_pkl_id = filename_to_id(dcp_test1_pkl);
 static boost::filesystem::path const dcp_test1_cpl = find_file("test/ref/DCP/dcp_test1", "cpl_").filename();
 static string const dcp_test1_cpl_id = filename_to_id(dcp_test1_cpl);
 
-static string const dcp_test1_asset_map_id = "5d51e8a1-b2a5-4da6-9b66-4615c3609440";
+static string const dcp_test1_asset_map_id = "017b3de4-6dda-408d-b19b-6711354b0bc3";
 
 static boost::filesystem::path const encryption_test_cpl = find_file("test/ref/DCP/encryption_test", "cpl_").filename();
 static string const encryption_test_cpl_id = filename_to_id(encryption_test_cpl);
@@ -401,9 +401,9 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_picture_sound_hashes)
                        { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, dcp_test1_cpl_id, canonical(dir / dcp_test1_cpl) },
                        { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_PICTURE_HASHES, canonical(dir / "video.mxf") },
                        { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_HASHES, canonical(dir / "audio.mxf") },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xLq7ot/GobgrqUYdlbR8FCD5APqs=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 26 },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xgVKhC9IkWyzQbgzpFcJ1bpqbtwk=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 19 },
-                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xznqYbl53W9ZQtrU2E1FQ6dwdM2M=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 12 },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xKcJb7S2K5cNm8RG4kfQD5FTeS0A=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 26 },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xtfX1mVIKJCVr1m7Y32Nzxf0+Rpw=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 12 },
+                       { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xwUmt8G+cFFKMGt0ueS9+F1S4uhc=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 19 },
                });
 }
 
@@ -501,7 +501,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_id)
        /* There's no MISMATCHED_CPL_HASHES error here because it can't find the correct hash by ID (since the ID is wrong) */
        check_verify_result_after_replace (
                        "invalid_xml_cpl_id", &cpl,
-                       "<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b", "<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375",
+                       "<Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab", "<Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358a",
                        { dcp::VerificationNote::Code::INVALID_XML }
                        );
 }