From 784020963f518aaba48b18b3fcff55d5c28a1f28 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 2 May 2022 17:49:32 +0200 Subject: Make some tests repeatable across platforms. --- cscript | 4 +- test/cpl_metadata_test.cc | 8 +- test/frame_info_hash_test.cc | 14 +- test/interop_subtitle_test.cc | 2 +- test/make_digest_test.cc | 10 +- test/recovery_test.cc | 2 - test/ref/DCP/dcp_test1/ASSETMAP.xml | 14 +- test/ref/DCP/dcp_test1/audio.mxf | Bin 881326 -> 881326 bytes .../cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml | 153 +++++++++++++++++++ .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 153 ------------------- .../pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml | 31 ---- .../pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml | 31 ++++ test/ref/DCP/dcp_test1/video.mxf | Bin 49240 -> 49240 bytes test/ref/DCP/dcp_test2/ASSETMAP.xml | 14 +- test/ref/DCP/dcp_test2/audio.mxf | Bin 161326 -> 161326 bytes .../cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml | 40 +++++ .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 40 ----- .../pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml | 31 ---- .../pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml | 31 ++++ test/ref/DCP/dcp_test2/video.mxf | Bin 63160 -> 63160 bytes test/ref/DCP/dcp_test5/ASSETMAP.xml | 14 +- test/ref/DCP/dcp_test5/audio.mxf | Bin 161326 -> 161326 bytes .../cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml | 49 +++++++ .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 49 ------- .../pkl_017b3de4-6dda-408d-b19b-6711354b0bc3.xml | 31 ++++ .../pkl_5d51e8a1-b2a5-4da6-9b66-4615c3609440.xml | 31 ---- test/ref/DCP/dcp_test5/video.mxf | Bin 40144 -> 40144 bytes test/ref/DCP/dcp_test7/ASSETMAP | 14 +- test/ref/DCP/dcp_test7/audio.mxf | Bin 881326 -> 881326 bytes .../cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml | 55 +++++++ .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 55 ------- .../pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml | 31 ---- .../pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml | 31 ++++ test/ref/DCP/dcp_test7/video.mxf | Bin 49240 -> 49240 bytes test/ref/DCP/encryption_test/ASSETMAP.xml | 14 +- test/ref/DCP/encryption_test/audio.mxf | Bin 165454 -> 165454 bytes .../cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml | 163 +++++++++++++++++++++ .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 163 --------------------- .../pkl_8ee8f7da-8da2-4adb-ae0e-31e8f4b91900.xml | 152 ------------------- .../pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml | 152 +++++++++++++++++++ test/ref/DCP/encryption_test/video.mxf | Bin 44032 -> 44032 bytes test/ref/write_interop_subtitle_test3/ASSETMAP | 14 +- .../cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml | 31 ---- .../cpl_5407b210-4441-4e97-8b16-8bdc7c12da54.xml | 30 ++++ .../d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png | Bin 44861 -> 0 bytes .../dd015243-ab77-435c-a13d-690566885121.png | Bin 0 -> 44861 bytes .../pkl_ac8d301c-e5d9-4343-b6f3-ba2668adbe56.xml | 30 ++++ .../pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml | 30 ---- test/ref/write_interop_subtitle_test3/subs.xml | 2 +- test/verify_test.cc | 10 +- 50 files changed, 865 insertions(+), 864 deletions(-) create mode 100644 test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml delete mode 100644 test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml delete mode 100644 test/ref/DCP/dcp_test1/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml create mode 100644 test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml create mode 100644 test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml delete mode 100644 test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml delete mode 100644 test/ref/DCP/dcp_test2/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml create mode 100644 test/ref/DCP/dcp_test2/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml create mode 100644 test/ref/DCP/dcp_test5/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml delete mode 100644 test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml create mode 100644 test/ref/DCP/dcp_test5/pkl_017b3de4-6dda-408d-b19b-6711354b0bc3.xml delete mode 100644 test/ref/DCP/dcp_test5/pkl_5d51e8a1-b2a5-4da6-9b66-4615c3609440.xml create mode 100644 test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml delete mode 100644 test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml delete mode 100644 test/ref/DCP/dcp_test7/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml create mode 100644 test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml create mode 100644 test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml delete mode 100644 test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml delete mode 100644 test/ref/DCP/encryption_test/pkl_8ee8f7da-8da2-4adb-ae0e-31e8f4b91900.xml create mode 100644 test/ref/DCP/encryption_test/pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml delete mode 100644 test/ref/write_interop_subtitle_test3/cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml create mode 100644 test/ref/write_interop_subtitle_test3/cpl_5407b210-4441-4e97-8b16-8bdc7c12da54.xml delete mode 100644 test/ref/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png create mode 100644 test/ref/write_interop_subtitle_test3/dd015243-ab77-435c-a13d-690566885121.png create mode 100644 test/ref/write_interop_subtitle_test3/pkl_ac8d301c-e5d9-4343-b6f3-ba2668adbe56.xml delete mode 100644 test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml diff --git a/cscript b/cscript index 84fa6111..d566a971 100644 --- 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 diff --git a/test/cpl_metadata_test.cc b/test/cpl_metadata_test.cc index b90aae4a..b141d271 100644 --- a/test/cpl_metadata_test.cc +++ b/test/cpl_metadata_test.cc @@ -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() + {"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()); - vector 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() + {"Id", "Hash"} ); } diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc index 3033bb5b..ed914916 100644 --- a/test/frame_info_hash_test.cc +++ b/test/frame_info_hash_test.cc @@ -36,6 +36,7 @@ #include "mono_picture_asset.h" #include "mono_picture_asset_writer.h" #include "openjpeg_image.h" +#include #include #include @@ -46,12 +47,12 @@ using std::string; static void -check (shared_ptr writer, string hash) +check (shared_ptr writer, boost::random::uniform_int_distribution<>& dist, boost::random::mt19937& rng, string hash) { auto xyz = make_shared(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::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"); } diff --git a/test/interop_subtitle_test.cc b/test/interop_subtitle_test.cc index 2d7c606a..3c500069 100644 --- a/test/interop_subtitle_test.cc +++ b/test/interop_subtitle_test.cc @@ -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() ); - 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"), diff --git a/test/make_digest_test.cc b/test/make_digest_test.cc index 9d37f837..98792e62 100644 --- a/test/make_digest_test.cc +++ b/test/make_digest_test.cc @@ -35,6 +35,7 @@ #include "array_data.h" #include "util.h" #include +#include #include #include @@ -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="); } diff --git a/test/recovery_test.cc b/test/recovery_test.cc index 1f76b964..62cb961a 100644 --- a/test/recovery_test.cc +++ b/test/recovery_test.cc @@ -77,9 +77,7 @@ BOOST_AUTO_TEST_CASE (recovery) fclose (f); } -#ifndef LIBDCP_WINDOWS Kumu::ResetTestRNG (); -#endif mp = make_shared(dcp::Fraction (24, 1), dcp::Standard::SMPTE); writer = mp->start_write ("build/test/baz/video2.mxf", true); diff --git a/test/ref/DCP/dcp_test1/ASSETMAP.xml b/test/ref/DCP/dcp_test1/ASSETMAP.xml index 962afeb3..f805bb28 100644 --- a/test/ref/DCP/dcp_test1/ASSETMAP.xml +++ b/test/ref/DCP/dcp_test1/ASSETMAP.xml @@ -1,6 +1,6 @@ - urn:uuid:5d51e8a1-b2a5-4da6-9b66-4615c3609440 + urn:uuid:017b3de4-6dda-408d-b19b-6711354b0bc3 A Test DCP OpenDCP 0.0.25 1 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f + urn:uuid:d199d58b-5ef8-4d49-b270-07e590ccb280 true - pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml + pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml 1 0 1179 @@ -20,10 +20,10 @@ - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b + urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab - cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml + cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml 1 0 8559 @@ -31,7 +31,7 @@ - urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 video.mxf @@ -42,7 +42,7 @@ - urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 + urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa audio.mxf diff --git a/test/ref/DCP/dcp_test1/audio.mxf b/test/ref/DCP/dcp_test1/audio.mxf index f095f00a..5e08f74f 100644 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 index 00000000..15cda9a1 --- /dev/null +++ b/test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -0,0 +1,153 @@ + + + urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab + A Test DCP + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + A Test DCP + trailer + + urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11 + content-version-label-text + + + + + urn:uuid:d1102bfd-65c2-465c-ab33-200ace46fcf5 + + + urn:uuid:3b198cbc-c1d2-4410-805c-397b6fea0297 + 24 1 + 24 + + + + 1 + + + + 23 + + + + + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 + 24 1 + 24 + 0 + 24 + wUmt8G+cFFKMGt0ueS9+F1S4uhc= + 24 1 + 1998 1080 + + + urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa + 24 1 + 24 + 0 + 24 + KcJb7S2K5cNm8RG4kfQD5FTeS0A= + + + urn:uuid:dd015243-ab77-435c-a13d-690566885121 + 24 1 + 24 + + 1 + 51/L,R,C,LFE,Ls,Rs + 48000 1 + + 1998 + 1080 + + + 1998 + 1080 + + + + Application + + + DCP Constraints Profile + SMPTE-RDD-52:2020-Bv2.1 + + + + + + + urn:uuid:6b06fecc-09d7-4b70-b1ae-16b274cb8b25 + urn:smpte:ul:060e2b34.0401010d.03020201.00000000 + urn:uuid:ddedca3d-a323-4355-a879-029bb90e9d1e + sg51 + 5.1 + en-US + + + urn:uuid:07cc8cb6-9385-4e33-aa38-bdcbf3a67698 + urn:smpte:ul:060e2b34.0401010d.03020101.00000000 + urn:uuid:67729deb-ce1f-46be-bd03-e674afa35c36 + chL + Left + 1 + en-US + urn:uuid:ddedca3d-a323-4355-a879-029bb90e9d1e + + + urn:uuid:d98861e8-aefc-433d-9e96-1745e7ba039e + urn:smpte:ul:060e2b34.0401010d.03020102.00000000 + urn:uuid:bc213c26-3e3f-488e-a99d-d9d0ad30f8f9 + chR + Right + 2 + en-US + urn:uuid:ddedca3d-a323-4355-a879-029bb90e9d1e + + + urn:uuid:d76fdaaf-8316-42dc-a87e-1719ad6ca3ca + urn:smpte:ul:060e2b34.0401010d.03020103.00000000 + urn:uuid:8577c7c0-be29-4eb5-a449-1e3870a42bbd + chC + Center + 3 + en-US + urn:uuid:ddedca3d-a323-4355-a879-029bb90e9d1e + + + urn:uuid:7a150034-0437-46d1-843c-864baf57adbf + urn:smpte:ul:060e2b34.0401010d.03020104.00000000 + urn:uuid:76aef948-ca63-4d4a-b707-27727c55d370 + chLFE + LFE + 4 + en-US + urn:uuid:ddedca3d-a323-4355-a879-029bb90e9d1e + + + urn:uuid:5668a4e3-2941-40a5-826e-c47d228239e9 + urn:smpte:ul:060e2b34.0401010d.03020105.00000000 + urn:uuid:cbeeef80-f3bc-4407-bd4b-2e546fea6945 + chLs + Left Surround + 5 + en-US + urn:uuid:ddedca3d-a323-4355-a879-029bb90e9d1e + + + urn:uuid:b04ce7c7-3f9f-45c2-b70c-a0f2cafbe391 + urn:smpte:ul:060e2b34.0401010d.03020106.00000000 + urn:uuid:ce0f527a-a71e-4b60-a5ab-da9d6dd7882e + chRs + Right Surround + 6 + en-US + urn:uuid:ddedca3d-a323-4355-a879-029bb90e9d1e + + + + + + + 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 index 6c1b2ad7..00000000 --- a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - A Test DCP - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - A Test DCP - trailer - - urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11 - content-version-label-text - - - - - urn:uuid:793170e7-e913-404b-8942-1c7f2e5cf012 - - - urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff - 24 1 - 24 - - - - 1 - - - - 23 - - - - - urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 - 24 1 - 24 - 0 - 24 - gVKhC9IkWyzQbgzpFcJ1bpqbtwk= - 24 1 - 1998 1080 - - - urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 - 24 1 - 24 - 0 - 24 - Lq7ot/GobgrqUYdlbR8FCD5APqs= - - - urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71 - 24 1 - 24 - - 1 - 51/L,R,C,LFE,Ls,Rs - 48000 1 - - 1998 - 1080 - - - 1998 - 1080 - - - - Application - - - DCP Constraints Profile - SMPTE-RDD-52:2020-Bv2.1 - - - - - - - urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09 - urn:smpte:ul:060e2b34.0401010d.03020201.00000000 - urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 - sg51 - 5.1 - en-US - - - urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d - urn:smpte:ul:060e2b34.0401010d.03020101.00000000 - urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55 - chL - Left - 1 - en-US - urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 - - - urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430 - urn:smpte:ul:060e2b34.0401010d.03020102.00000000 - urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c - chR - Right - 2 - en-US - urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 - - - urn:uuid:07e9f5a0-83ab-4791-8c6b-7df5d11f76f9 - urn:smpte:ul:060e2b34.0401010d.03020103.00000000 - urn:uuid:2b9b857f-ab4a-440e-a313-1ace0f1cfc95 - chC - Center - 3 - en-US - urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 - - - urn:uuid:3cf6c3a1-0b08-4033-96b5-1eefaf505371 - urn:smpte:ul:060e2b34.0401010d.03020104.00000000 - urn:uuid:9780965c-1d68-4829-b2cf-9666b6b91bd9 - chLFE - LFE - 4 - en-US - urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 - - - urn:uuid:0b93e03a-e6c1-4ad1-9a98-223a62c7e37f - urn:smpte:ul:060e2b34.0401010d.03020105.00000000 - urn:uuid:18a0931c-9ecf-49cc-b851-8f1c6e0849bf - chLs - Left Surround - 5 - en-US - urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 - - - urn:uuid:7b6616d2-9afe-4d54-a2bb-4f3f71ac6e0c - urn:smpte:ul:060e2b34.0401010d.03020106.00000000 - urn:uuid:b6a34428-b4a5-4edf-bd3f-cf57be31cd2f - chRs - Right Surround - 6 - en-US - urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 - - - - - - - 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 index 588c7d48..00000000 --- a/test/ref/DCP/dcp_test1/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f - A Test DCP - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - - - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - 81fb54df-e1bf-4647-8788-ea7ba154375b - znqYbl53W9ZQtrU2E1FQ6dwdM2M= - 8559 - text/xml - - - urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 - 46c3eb45-15e5-47d6-8684-d8641e4dc516 - gVKhC9IkWyzQbgzpFcJ1bpqbtwk= - 49240 - application/mxf - - - urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 - 8b92bcee-62fc-4a33-a51a-816e9611ce85 - Lq7ot/GobgrqUYdlbR8FCD5APqs= - 881326 - application/mxf - - - 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 index 00000000..dd963585 --- /dev/null +++ b/test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml @@ -0,0 +1,31 @@ + + + urn:uuid:d199d58b-5ef8-4d49-b270-07e590ccb280 + A Test DCP + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + + + urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab + 6affb8ee-0020-4dff-a53c-17652f6358ab + tfX1mVIKJCVr1m7Y32Nzxf0+Rpw= + 8559 + text/xml + + + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 + 5407b210-4441-4e97-8b16-8bdc7c12da54 + wUmt8G+cFFKMGt0ueS9+F1S4uhc= + 49240 + application/mxf + + + urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa + 97f0f352-5b77-48ee-a558-9df37717f4fa + KcJb7S2K5cNm8RG4kfQD5FTeS0A= + 881326 + application/mxf + + + diff --git a/test/ref/DCP/dcp_test1/video.mxf b/test/ref/DCP/dcp_test1/video.mxf index 4ff8e3b3..27ba41cf 100644 Binary files a/test/ref/DCP/dcp_test1/video.mxf and b/test/ref/DCP/dcp_test1/video.mxf differ diff --git a/test/ref/DCP/dcp_test2/ASSETMAP.xml b/test/ref/DCP/dcp_test2/ASSETMAP.xml index 23390415..e0adff1e 100644 --- a/test/ref/DCP/dcp_test2/ASSETMAP.xml +++ b/test/ref/DCP/dcp_test2/ASSETMAP.xml @@ -1,6 +1,6 @@ - urn:uuid:5d51e8a1-b2a5-4da6-9b66-4615c3609440 + urn:uuid:017b3de4-6dda-408d-b19b-6711354b0bc3 Created by libdcp OpenDCP 0.0.25 1 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f + urn:uuid:d199d58b-5ef8-4d49-b270-07e590ccb280 true - pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml + pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml 1 0 1186 @@ -20,10 +20,10 @@ - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b + urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab - cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml + cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml 1 0 1686 @@ -31,7 +31,7 @@ - urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 video.mxf @@ -42,7 +42,7 @@ - urn:uuid:77e1fb48-ce0c-4d29-bf88-8c3bfec8013a + urn:uuid:fc843acc-1ad9-4808-b9ed-33f5319e047d audio.mxf diff --git a/test/ref/DCP/dcp_test2/audio.mxf b/test/ref/DCP/dcp_test2/audio.mxf index 9fc24355..4416225c 100644 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 index 00000000..d9eb222e --- /dev/null +++ b/test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -0,0 +1,40 @@ + + + urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab + A Test DCP + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + A Test DCP + feature + + urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 + 81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 + + + + + urn:uuid:3b198cbc-c1d2-4410-805c-397b6fea0297 + + + urn:uuid:fc843acc-1ad9-4808-b9ed-33f5319e047d + 24 1 + 24 + 0 + 24 + 3PtaGoYcvBdq5WYiK0cmeDwm8d0= + + + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 + 24 1 + 24 + 0 + 24 + BUpeFS6X9j+X0z2TZWSsLMT4pE0= + 48 1 + 1998 1080 + + + + + 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 index 3910dcd3..00000000 --- a/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - A Test DCP - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - A Test DCP - feature - - urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 - 81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 - - - - - urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff - - - urn:uuid:77e1fb48-ce0c-4d29-bf88-8c3bfec8013a - 24 1 - 24 - 0 - 24 - 79TC6lDP5q0zzHZRm1wOnrObdYQ= - - - urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 - 24 1 - 24 - 0 - 24 - JFrPt5QPaWmGMFxMMdYr7MhA3Bs= - 48 1 - 1998 1080 - - - - - 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 index abfd5100..00000000 --- a/test/ref/DCP/dcp_test2/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f - Created by libdcp - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - - - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - 81fb54df-e1bf-4647-8788-ea7ba154375b - 9JCFUMDcUujOZxSqSig3u/5wIuI= - 1686 - text/xml - - - urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 - 46c3eb45-15e5-47d6-8684-d8641e4dc516 - JFrPt5QPaWmGMFxMMdYr7MhA3Bs= - 63160 - application/mxf - - - urn:uuid:77e1fb48-ce0c-4d29-bf88-8c3bfec8013a - 77e1fb48-ce0c-4d29-bf88-8c3bfec8013a - 79TC6lDP5q0zzHZRm1wOnrObdYQ= - 161326 - application/mxf - - - 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 index 00000000..d1162163 --- /dev/null +++ b/test/ref/DCP/dcp_test2/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml @@ -0,0 +1,31 @@ + + + urn:uuid:d199d58b-5ef8-4d49-b270-07e590ccb280 + Created by libdcp + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + + + urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab + 6affb8ee-0020-4dff-a53c-17652f6358ab + 6F7kAEYbNdv6gz6PG5JcMjGF8kU= + 1686 + text/xml + + + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 + 5407b210-4441-4e97-8b16-8bdc7c12da54 + BUpeFS6X9j+X0z2TZWSsLMT4pE0= + 63160 + application/mxf + + + urn:uuid:fc843acc-1ad9-4808-b9ed-33f5319e047d + fc843acc-1ad9-4808-b9ed-33f5319e047d + 3PtaGoYcvBdq5WYiK0cmeDwm8d0= + 161326 + application/mxf + + + diff --git a/test/ref/DCP/dcp_test2/video.mxf b/test/ref/DCP/dcp_test2/video.mxf index 2cd228ae..3b670708 100644 Binary files a/test/ref/DCP/dcp_test2/video.mxf and b/test/ref/DCP/dcp_test2/video.mxf differ diff --git a/test/ref/DCP/dcp_test5/ASSETMAP.xml b/test/ref/DCP/dcp_test5/ASSETMAP.xml index fb9f897a..42b8133b 100644 --- a/test/ref/DCP/dcp_test5/ASSETMAP.xml +++ b/test/ref/DCP/dcp_test5/ASSETMAP.xml @@ -1,6 +1,6 @@ - urn:uuid:8f8d5c1f-cd57-4bcc-9827-ff398e5832cf + urn:uuid:4f26ba15-f1bc-450a-aaeb-8a4801ce11d5 Created by libdcp OpenDCP 0.0.25 1 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:5d51e8a1-b2a5-4da6-9b66-4615c3609440 + urn:uuid:017b3de4-6dda-408d-b19b-6711354b0bc3 true - pkl_5d51e8a1-b2a5-4da6-9b66-4615c3609440.xml + pkl_017b3de4-6dda-408d-b19b-6711354b0bc3.xml 1 0 1186 @@ -20,10 +20,10 @@ - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b + urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab - cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml + cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml 1 0 2024 @@ -31,7 +31,7 @@ - urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 video.mxf @@ -42,7 +42,7 @@ - urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 + urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa audio.mxf diff --git a/test/ref/DCP/dcp_test5/audio.mxf b/test/ref/DCP/dcp_test5/audio.mxf index 5e9faba5..499ea47c 100644 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 index 00000000..eb85a118 --- /dev/null +++ b/test/ref/DCP/dcp_test5/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -0,0 +1,49 @@ + + + urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab + A Test DCP + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + A Test DCP + feature + + urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 + 81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 + + + + + urn:uuid:d199d58b-5ef8-4d49-b270-07e590ccb280 + + + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 + 24 1 + 24 + 0 + 24 + o3VmpdFsNUgF11oadcaGJ/IfO0M= + 24 1 + 1998 1080 + + + urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa + 24 1 + 24 + 0 + 24 + wLbXcpQtWt2IFMHIcibxwND667I= + + + urn:uuid:b68febcc-5ddf-489a-84a7-924f29fa2afd + 24 1 + 1489 + 0 + 1489 + jo8pQSebhScPN4EVvvpIUWRrDeM= + urn:smpte:ul:060e2b34.04010105.0e090604.00000000 + + + + + 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 index 69558723..00000000 --- a/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - A Test DCP - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - A Test DCP - feature - - urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 - 81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 - - - - - urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f - - - urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 - 24 1 - 24 - 0 - 24 - ocljCBd/zl1KRFBVRVTtSmR3qf0= - 24 1 - 1998 1080 - - - urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 - 24 1 - 24 - 0 - 24 - UwaCvlFLCOKQhQB12hdVceJudgc= - - - urn:uuid:b68febcc-5ddf-489a-84a7-924f29fa2afd - 24 1 - 1489 - 0 - 1489 - jo8pQSebhScPN4EVvvpIUWRrDeM= - urn:smpte:ul:060e2b34.04010105.0e090604.00000000 - - - - - 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 index 00000000..77d67c23 --- /dev/null +++ b/test/ref/DCP/dcp_test5/pkl_017b3de4-6dda-408d-b19b-6711354b0bc3.xml @@ -0,0 +1,31 @@ + + + urn:uuid:017b3de4-6dda-408d-b19b-6711354b0bc3 + Created by libdcp + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + + + urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab + 6affb8ee-0020-4dff-a53c-17652f6358ab + kiv8PHo8XZc/lI2xk7qYghrP2SA= + 2024 + text/xml + + + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 + 5407b210-4441-4e97-8b16-8bdc7c12da54 + o3VmpdFsNUgF11oadcaGJ/IfO0M= + 40144 + application/mxf + + + urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa + 97f0f352-5b77-48ee-a558-9df37717f4fa + wLbXcpQtWt2IFMHIcibxwND667I= + 161326 + application/mxf + + + 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 index 0ae84d3d..00000000 --- a/test/ref/DCP/dcp_test5/pkl_5d51e8a1-b2a5-4da6-9b66-4615c3609440.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - urn:uuid:5d51e8a1-b2a5-4da6-9b66-4615c3609440 - Created by libdcp - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - - - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - 81fb54df-e1bf-4647-8788-ea7ba154375b - +a4c/A2gZJW4rVH5BZ7jbb6qXkc= - 2024 - text/xml - - - urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 - 46c3eb45-15e5-47d6-8684-d8641e4dc516 - ocljCBd/zl1KRFBVRVTtSmR3qf0= - 40144 - application/mxf - - - urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 - 8b92bcee-62fc-4a33-a51a-816e9611ce85 - UwaCvlFLCOKQhQB12hdVceJudgc= - 161326 - application/mxf - - - diff --git a/test/ref/DCP/dcp_test5/video.mxf b/test/ref/DCP/dcp_test5/video.mxf index 0925dbd7..f3e7588b 100644 Binary files a/test/ref/DCP/dcp_test5/video.mxf and b/test/ref/DCP/dcp_test5/video.mxf differ diff --git a/test/ref/DCP/dcp_test7/ASSETMAP b/test/ref/DCP/dcp_test7/ASSETMAP index 0e40e455..f41b1366 100644 --- a/test/ref/DCP/dcp_test7/ASSETMAP +++ b/test/ref/DCP/dcp_test7/ASSETMAP @@ -1,6 +1,6 @@ - urn:uuid:5d51e8a1-b2a5-4da6-9b66-4615c3609440 + urn:uuid:017b3de4-6dda-408d-b19b-6711354b0bc3 Created by libdcp 1 2012-07-17T04:45:18+00:00 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f + urn:uuid:d199d58b-5ef8-4d49-b270-07e590ccb280 true - pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml + pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml 1 0 1253 @@ -20,10 +20,10 @@ - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b + urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab - cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml + cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml 1 0 1965 @@ -31,7 +31,7 @@ - urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 video.mxf @@ -42,7 +42,7 @@ - urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 + urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa audio.mxf diff --git a/test/ref/DCP/dcp_test7/audio.mxf b/test/ref/DCP/dcp_test7/audio.mxf index f095f00a..5e08f74f 100644 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 index 00000000..b73ef84c --- /dev/null +++ b/test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -0,0 +1,55 @@ + + + urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab + A Test DCP + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + A Test DCP + trailer + + urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11 + content-version-label-text + + + + + urn:uuid:d1102bfd-65c2-465c-ab33-200ace46fcf5 + + + urn:uuid:3b198cbc-c1d2-4410-805c-397b6fea0297 + 24 1 + 24 + + + + 1 + + + + 23 + + + + + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 + 24 1 + 24 + 0 + 24 + wUmt8G+cFFKMGt0ueS9+F1S4uhc= + 24 1 + 1.85 + + + urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa + 24 1 + 24 + 0 + 24 + KcJb7S2K5cNm8RG4kfQD5FTeS0A= + + + + + 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 index 58e5897c..00000000 --- a/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - A Test DCP - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - A Test DCP - trailer - - urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11 - content-version-label-text - - - - - urn:uuid:793170e7-e913-404b-8942-1c7f2e5cf012 - - - urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff - 24 1 - 24 - - - - 1 - - - - 23 - - - - - urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 - 24 1 - 24 - 0 - 24 - gVKhC9IkWyzQbgzpFcJ1bpqbtwk= - 24 1 - 1.85 - - - urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 - 24 1 - 24 - 0 - 24 - Lq7ot/GobgrqUYdlbR8FCD5APqs= - - - - - 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 index c8190a2f..00000000 --- a/test/ref/DCP/dcp_test7/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f - Created by libdcp - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - - - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - 81fb54df-e1bf-4647-8788-ea7ba154375b - V/3WP9Ff60ZtDhisE5onL9wo2tY= - 1965 - text/xml;asdcpKind=CPL - - - urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 - 46c3eb45-15e5-47d6-8684-d8641e4dc516 - gVKhC9IkWyzQbgzpFcJ1bpqbtwk= - 49240 - application/x-smpte-mxf;asdcpKind=Picture - - - urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 - 8b92bcee-62fc-4a33-a51a-816e9611ce85 - Lq7ot/GobgrqUYdlbR8FCD5APqs= - 881326 - application/x-smpte-mxf;asdcpKind=Sound - - - 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 index 00000000..20bad65e --- /dev/null +++ b/test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml @@ -0,0 +1,31 @@ + + + urn:uuid:d199d58b-5ef8-4d49-b270-07e590ccb280 + Created by libdcp + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + + + urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab + 6affb8ee-0020-4dff-a53c-17652f6358ab + Vsre14v3AhK6X2gUzeYF9G8GKo0= + 1965 + text/xml;asdcpKind=CPL + + + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 + 5407b210-4441-4e97-8b16-8bdc7c12da54 + wUmt8G+cFFKMGt0ueS9+F1S4uhc= + 49240 + application/x-smpte-mxf;asdcpKind=Picture + + + urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa + 97f0f352-5b77-48ee-a558-9df37717f4fa + KcJb7S2K5cNm8RG4kfQD5FTeS0A= + 881326 + application/x-smpte-mxf;asdcpKind=Sound + + + diff --git a/test/ref/DCP/dcp_test7/video.mxf b/test/ref/DCP/dcp_test7/video.mxf index 4ff8e3b3..27ba41cf 100644 Binary files a/test/ref/DCP/dcp_test7/video.mxf and b/test/ref/DCP/dcp_test7/video.mxf differ diff --git a/test/ref/DCP/encryption_test/ASSETMAP.xml b/test/ref/DCP/encryption_test/ASSETMAP.xml index 71fa54ac..2b762d37 100644 --- a/test/ref/DCP/encryption_test/ASSETMAP.xml +++ b/test/ref/DCP/encryption_test/ASSETMAP.xml @@ -1,6 +1,6 @@ - urn:uuid:e5c3091b-f61e-459c-9faf-210bd4d3c7bf + urn:uuid:460be38d-d560-455c-ad57-b2e80ca9b228 Created by libdcp OpenDCP 0.0.25 1 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:8ee8f7da-8da2-4adb-ae0e-31e8f4b91900 + urn:uuid:93887017-5d6a-4ee5-b5f4-161b06281d0e true - pkl_8ee8f7da-8da2-4adb-ae0e-31e8f4b91900.xml + pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml 1 0 8708 @@ -20,10 +20,10 @@ - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b + urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab - cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml + cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml 1 0 9226 @@ -31,7 +31,7 @@ - urn:uuid:e98d059d-645f-4343-a30f-edc61d58b8e0 + urn:uuid:9a7fbb03-4078-4944-90b1-0d8a21c9d793 video.mxf @@ -42,7 +42,7 @@ - urn:uuid:11471a77-7cd8-4de6-8c11-beaa198c015f + urn:uuid:ce300880-a425-40a6-adac-eb1e3f5643fc audio.mxf diff --git a/test/ref/DCP/encryption_test/audio.mxf b/test/ref/DCP/encryption_test/audio.mxf index 1b6eb33c..61839db4 100644 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 index 00000000..2043a079 --- /dev/null +++ b/test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -0,0 +1,163 @@ + + + urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab + A Test DCP + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + A Test DCP + feature + + urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 + 81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 + + + + + urn:uuid:c1d35c2a-39c5-46b8-bbeb-7a1cdffff013 + + + urn:uuid:9a7fbb03-4078-4944-90b1-0d8a21c9d793 + 24 1 + 24 + 0 + 24 + urn:uuid:ac8d301c-e5d9-4343-b6f3-ba2668adbe56 + 8r+Gnfyg5fxetQxyddD7fjzH3Qo= + 24 1 + 1998 1080 + + + urn:uuid:ce300880-a425-40a6-adac-eb1e3f5643fc + 24 1 + 24 + 0 + 24 + urn:uuid:7ab6c77b-6648-44b9-8549-a5290ada6238 + lS+FKcwLD7cRjgZMQ+hvGg/yJIc= + + + + + + + + dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + 7 + + dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + + + + + + + + + + + + 0FHIG9HMW/Sp8GfYHLV0p86GCWY= + + + tk/wncwRngGXR2towgLMj+3Odk6pbPQtvcYTnILFu2M15IN6Iau3SiNW+2TBYRMK +zuNVKBxYX2Q0Hk5znioC8q/GHpN1NWV+oglEaAJmqkmTX/KL2gIrfZCQsL7wQ5DE +7wHq4URRO24Q+K1DnnyXBe70WugikvkJI7iFqWN+qjEPebP8lBbOUKVcCpqcUgIC +7Omb2/W9Nx/7NZv3F1vTctna20rZnVHp86bccHrlUvGVbGs9svEPuPKEjBQlym3z +SU5nyTIZ7NMM27QE9lQ8O/LUMoP2pLtc7eNnEnNzLkIZGXoDOBu2KELtDQjojqIk +8QnEQSXk9FpUVNaGl3gruw== + + + + dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + 7 + + 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= + + + + dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + 6 + + 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 + + + + dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + 5 + + 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== + + + + 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 index 2866df6d..00000000 --- a/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - A Test DCP - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - A Test DCP - feature - - urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 - 81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 - - - - - urn:uuid:627ad740-ae36-4c49-92bb-553a9f09c4f8 - - - urn:uuid:e98d059d-645f-4343-a30f-edc61d58b8e0 - 24 1 - 24 - 0 - 24 - urn:uuid:e94b8a0d-27f7-408a-af16-78d3df419a91 - GwEhpziCPkDM7vuFOzhy4Em0EOI= - 24 1 - 1998 1080 - - - urn:uuid:11471a77-7cd8-4de6-8c11-beaa198c015f - 24 1 - 24 - 0 - 24 - urn:uuid:a4f49b5e-622f-45f3-8ba7-63ce1fd40e78 - MSuGS6IIIQKGHR626+XAUbJj1zY= - - - - - - - - dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - 7 - - dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - - - - - - - - - - - - 4/8QgoO0blTh31eQ8ubu1zkECYc= - - - jHGd0G9X7iT26LNertFIPsKGIVUxUNEZWSDmjzYH4QwP2SAYOMh/tGXAaUQyy2vA -+qCj+OQavpBS8q1HMekyUrShRo18XY6mpS3lSADdZBY7TLExCdkLtSq7yoPVfzx+ -+iRypVIKBl6xbv9wf/ssCzpxXMbsuaL5BGbOdRlgH7FFdQN5GKbAWVYoCmPHcl+q -S2BLqXN1S9LjB4zQ606bVq2C4S7mUYqAFZ0a9w/MK1RU5kFRJfq7W2ZktvhIWrFI -K6iF4XGhwoCURfPKP9piAwrpR+5sI7LuknMLa/JHPYzkBCH63oZoNW8vHyzCBNpR -ADgG10jZGAXp+GY0BL8v2w== - - - - dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - 7 - - 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= - - - - dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - 6 - - 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 - - - - dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - 5 - - 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== - - - - 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 index b97d6eaf..00000000 --- a/test/ref/DCP/encryption_test/pkl_8ee8f7da-8da2-4adb-ae0e-31e8f4b91900.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - urn:uuid:8ee8f7da-8da2-4adb-ae0e-31e8f4b91900 - Created by libdcp - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - - - urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - 81fb54df-e1bf-4647-8788-ea7ba154375b - zk4L2kXj9llDdjmxCW2d2X06VQM= - 9226 - text/xml - - - urn:uuid:e98d059d-645f-4343-a30f-edc61d58b8e0 - e98d059d-645f-4343-a30f-edc61d58b8e0 - GwEhpziCPkDM7vuFOzhy4Em0EOI= - 44032 - application/mxf - - - urn:uuid:11471a77-7cd8-4de6-8c11-beaa198c015f - 11471a77-7cd8-4de6-8c11-beaa198c015f - MSuGS6IIIQKGHR626+XAUbJj1zY= - 165454 - application/mxf - - - - - - dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - 7 - - dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - - - - - - - - - - - - xzO3cFwUX87TL4rL9jq6CLqDN6I= - - - VIZyD5JmV2gnPyzMEMwDaIg+NBOZzpSvBoRtPbWrYUyjxVzQfPvFzAAE+4hz8Wc7 -TIpiTZ3sYXKRQAEmA4Iu5AOJ2uijv8tnioo2FyV6JT9aGr5cNi7eeGFmN7ILU4zc -rgp99iWgTRms8T8C7zy/NtE8P2q8K4sxQvxnYmK/0kHkQPQnWpZafAd6G/fpoV0h -5W8UQTtn72OEPhm21uxp4crWRk9YlF2ayGYDBGm8YFP01w663e0r61xq6ROW2O4i -jR2dQWPM1nzrafHSJKg2TL4S/GtTsDNNuIJihzGpmEjULX2FIt83f6dogyr7K624 -XcjpahE+WHn7WR3VVZsMkw== - - - - dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - 7 - - 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= - - - - dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - 6 - - 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 - - - - dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - 5 - - 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== - - - - 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 index 00000000..c4bdfb7e --- /dev/null +++ b/test/ref/DCP/encryption_test/pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml @@ -0,0 +1,152 @@ + + + urn:uuid:93887017-5d6a-4ee5-b5f4-161b06281d0e + Created by libdcp + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + + + urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab + 6affb8ee-0020-4dff-a53c-17652f6358ab + wktgMUem87F6zSpc33A4w1pW00Q= + 9226 + text/xml + + + urn:uuid:9a7fbb03-4078-4944-90b1-0d8a21c9d793 + 9a7fbb03-4078-4944-90b1-0d8a21c9d793 + 8r+Gnfyg5fxetQxyddD7fjzH3Qo= + 44032 + application/mxf + + + urn:uuid:ce300880-a425-40a6-adac-eb1e3f5643fc + ce300880-a425-40a6-adac-eb1e3f5643fc + lS+FKcwLD7cRjgZMQ+hvGg/yJIc= + 165454 + application/mxf + + + + + + dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + 7 + + dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + + + + + + + + + + + + zxq+xgZYL/vhqtTzyFMZzWP0JDQ= + + + HifYYYkxSunbBcUYtUcIQDZf8kHcXhO7TnQWdnqQ4HxHKK3Man8jnNXXl0i5t8cO +B9pHrBUQy1C50R/h2dW0B7cpeQLowX8UwJyl1yYoH62m/CIgDT/Zx4ji9M+Ogve9 +RS/SoXnMEeQotCQit3li9br5dW0hjptUn5ZDoyi+i4mpsjtuBQvPYymeFoey5oIV +9DJXOS1uM/wSEbsDX6zyHOUW1l2jKVPyshulWoufc39QqcpuGDmnAY/zEHqMVBAm ++ycVhMI/Q8MlXggHNL1VYqWkplNAfElpbys1a/tMCFqpqk+BJ9IwMej5ypTASTKH +sQH4u5vjsTvq8+X5SdD0qg== + + + + dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + 7 + + 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= + + + + dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + 6 + + 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 + + + + dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + 5 + + 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== + + + + diff --git a/test/ref/DCP/encryption_test/video.mxf b/test/ref/DCP/encryption_test/video.mxf index 5fe9a320..7bad39eb 100644 Binary files a/test/ref/DCP/encryption_test/video.mxf and b/test/ref/DCP/encryption_test/video.mxf differ diff --git a/test/ref/write_interop_subtitle_test3/ASSETMAP b/test/ref/write_interop_subtitle_test3/ASSETMAP index 570b0d5b..8dfb256d 100644 --- a/test/ref/write_interop_subtitle_test3/ASSETMAP +++ b/test/ref/write_interop_subtitle_test3/ASSETMAP @@ -1,6 +1,6 @@ - urn:uuid:47a8e83e-fd5f-445d-a1bc-9f59c5289c34 + urn:uuid:b3062f87-9060-4848-a664-d864d1877f1c Created by libdcp 1 2018-09-02T04:45:18+00:00 @@ -8,11 +8,11 @@ libdcp - urn:uuid:e94b8a0d-27f7-408a-af16-78d3df419a91 + urn:uuid:ac8d301c-e5d9-4343-b6f3-ba2668adbe56 true - pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml + pkl_ac8d301c-e5d9-4343-b6f3-ba2668adbe56.xml 1 0 1114 @@ -20,10 +20,10 @@ - urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 - cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml + cpl_5407b210-4441-4e97-8b16-8bdc7c12da54.xml 1 0 1061 @@ -42,10 +42,10 @@ - urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71 + urn:uuid:dd015243-ab77-435c-a13d-690566885121 - d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png + dd015243-ab77-435c-a13d-690566885121.png 1 0 44861 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 index 0d283b64..00000000 --- a/test/ref/write_interop_subtitle_test3/cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 - Created by libdcp - 2018-09-02T04:45:18+00:00 - libdcp - libdcp - My film - feature - - urn:uuid:6a9e31a6-50a4-4ecb-8683-fa667848470a - foo - - - - - urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 - - - urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6 - - 24 1 - 6046 - 0 - 6046 - cVnFjMLTQnSIAlIzJpNB/p7B230= - - - - - 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 index 00000000..5bbf02ec --- /dev/null +++ b/test/ref/write_interop_subtitle_test3/cpl_5407b210-4441-4e97-8b16-8bdc7c12da54.xml @@ -0,0 +1,30 @@ + + + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 + Created by libdcp + 2018-09-02T04:45:18+00:00 + libdcp + libdcp + My film + feature + + urn:uuid:b365eeb5-dcdf-4aaf-83f0-1202fa5d3ca8 + foo + + + + + urn:uuid:73e16051-f99a-4bf4-b96a-c432d32aa19f + + + urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6 + 24 1 + 6046 + 0 + 6046 + RmflhDu9QYUsNnBftdNlIEGdzG0= + + + + + 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 index 9d8f2988..00000000 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 index 00000000..9d8f2988 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 index 00000000..362177c7 --- /dev/null +++ b/test/ref/write_interop_subtitle_test3/pkl_ac8d301c-e5d9-4343-b6f3-ba2668adbe56.xml @@ -0,0 +1,30 @@ + + + urn:uuid:ac8d301c-e5d9-4343-b6f3-ba2668adbe56 + Created by libdcp + 2018-09-02T04:45:18+00:00 + libdcp + libdcp + + + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 + 5407b210-4441-4e97-8b16-8bdc7c12da54 + M9U2kzcnfcBAy7MrXZGKjA8hQRU= + 1061 + text/xml;asdcpKind=CPL + + + urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6 + a6c58cff-3e1e-4b38-acec-a42224475ef6 + RmflhDu9QYUsNnBftdNlIEGdzG0= + 438 + text/xml;asdcpKind=Subtitle + + + urn:uuid:dd015243-ab77-435c-a13d-690566885121 + 2vTylSKQ5MCQHbKPT4X+rlwfHk4= + 44861 + image/png + + + 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 index 6f192259..00000000 --- a/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - urn:uuid:e94b8a0d-27f7-408a-af16-78d3df419a91 - Created by libdcp - 2018-09-02T04:45:18+00:00 - libdcp - libdcp - - - urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 - 46c3eb45-15e5-47d6-8684-d8641e4dc516 - Y8rZTMi93JjmkgwFK7Fu3W5rz/Y= - 1061 - text/xml;asdcpKind=CPL - - - urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6 - a6c58cff-3e1e-4b38-acec-a42224475ef6 - ilLkOSjxgHZxkAdOPVJBoDFiUh8= - 438 - text/xml;asdcpKind=Subtitle - - - urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71 - 2vTylSKQ5MCQHbKPT4X+rlwfHk4= - 44861 - image/png - - - diff --git a/test/ref/write_interop_subtitle_test3/subs.xml b/test/ref/write_interop_subtitle_test3/subs.xml index 050ee930..74901300 100644 --- a/test/ref/write_interop_subtitle_test3/subs.xml +++ b/test/ref/write_interop_subtitle_test3/subs.xml @@ -5,6 +5,6 @@ 1 EN - d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png + dd015243-ab77-435c-a13d-690566885121.png diff --git a/test/verify_test.cc b/test/verify_test.cc index 38be998b..20bef0fa 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -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, - "urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b", "urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375", + "urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab", "urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358a", { dcp::VerificationNote::Code::INVALID_XML } ); } -- cgit v1.2.3