From f77a03cc3ec0c5f917e0a2b6cf7599d035b34cff Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 9 Sep 2020 22:41:52 +0200 Subject: Use the read in when the Reel was created from XML (if appropriate) when writing it out again, rather than creating a new one each time. Also there is the associated test churn here from removing a call to make_uuid(). --- src/reel.cc | 2 +- test/ref/DCP/dcp_test1/ASSETMAP.xml | 6 +- .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 2 +- .../pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml | 31 +++++ .../pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml | 31 ----- test/ref/DCP/dcp_test2/ASSETMAP.xml | 6 +- .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 2 +- .../pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml | 31 ----- .../pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml | 31 +++++ test/ref/DCP/dcp_test5/ASSETMAP.xml | 6 +- .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 2 +- .../pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml | 31 ----- .../pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml | 31 +++++ test/ref/DCP/dcp_test7/ASSETMAP | 6 +- .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 2 +- .../pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml | 31 +++++ .../pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml | 31 ----- test/ref/DCP/encryption_test/ASSETMAP.xml | 6 +- .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 16 +-- .../pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml | 152 --------------------- .../pkl_93182bd2-b1e8-41a3-b5c8-6e6564273bff.xml | 152 +++++++++++++++++++++ test/ref/write_interop_subtitle_test3/ASSETMAP | 6 +- .../cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml | 31 +++++ .../cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml | 31 ----- .../d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png | Bin 0 -> 44935 bytes .../ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png | Bin 44935 -> 0 bytes test/ref/write_interop_subtitle_test3/pkl.xml | 2 +- .../pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml | 30 ++++ .../pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml | 30 ---- test/verify_test.cc | 10 +- test/write_subtitle_test.cc | 2 +- 31 files changed, 375 insertions(+), 375 deletions(-) create mode 100644 test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml delete mode 100644 test/ref/DCP/dcp_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml delete mode 100644 test/ref/DCP/dcp_test2/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml create mode 100644 test/ref/DCP/dcp_test2/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml delete mode 100644 test/ref/DCP/dcp_test5/pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml create mode 100644 test/ref/DCP/dcp_test5/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml create mode 100644 test/ref/DCP/dcp_test7/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml delete mode 100644 test/ref/DCP/dcp_test7/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml delete mode 100644 test/ref/DCP/encryption_test/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml create mode 100644 test/ref/DCP/encryption_test/pkl_93182bd2-b1e8-41a3-b5c8-6e6564273bff.xml create mode 100644 test/ref/write_interop_subtitle_test3/cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml delete mode 100644 test/ref/write_interop_subtitle_test3/cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml create mode 100644 test/ref/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png delete mode 100644 test/ref/write_interop_subtitle_test3/ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png create mode 100644 test/ref/write_interop_subtitle_test3/pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml delete mode 100644 test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml diff --git a/src/reel.cc b/src/reel.cc index 036147d6..453a3163 100644 --- a/src/reel.cc +++ b/src/reel.cc @@ -119,7 +119,7 @@ void Reel::write_to_cpl (xmlpp::Element* node, Standard standard) const { xmlpp::Element* reel = node->add_child ("Reel"); - reel->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid()); + reel->add_child("Id")->add_child_text("urn:uuid:" + _id); xmlpp::Element* asset_list = reel->add_child ("AssetList"); if (_main_markers) { diff --git a/test/ref/DCP/dcp_test1/ASSETMAP.xml b/test/ref/DCP/dcp_test1/ASSETMAP.xml index b0ad60dc..401c6c6d 100644 --- a/test/ref/DCP/dcp_test1/ASSETMAP.xml +++ b/test/ref/DCP/dcp_test1/ASSETMAP.xml @@ -1,6 +1,6 @@ - urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55 + urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09 Created by libdcp OpenDCP 0.0.25 1 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09 + urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 true - pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml + pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml 1 0 1186 diff --git a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml index f7134807..682ae510 100644 --- a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -14,7 +14,7 @@ - urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 + urn:uuid:8e293965-f8ad-48c6-971d-261b01f65cdb urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 diff --git a/test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml b/test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml new file mode 100644 index 00000000..105a7110 --- /dev/null +++ b/test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml @@ -0,0 +1,31 @@ + + + urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 + 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 + xU8Fk6atIPk9mlT9F1n9s+FgF8c= + 1585 + text/xml + + + urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 + 1fab8bb0-cfaf-4225-ad6d-01768bc10470 + 1uPB643nrQfpY+Y0AypGko+PiPE= + 26080 + application/mxf + + + urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9 + 9482e87d-292d-4e0e-a98d-c61822b60fe9 + ifmC1P7fjigb1oVxx6xs3Paz/GY= + 161326 + application/mxf + + + diff --git a/test/ref/DCP/dcp_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml b/test/ref/DCP/dcp_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml deleted file mode 100644 index 8b24a133..00000000 --- a/test/ref/DCP/dcp_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09 - 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 - Cl6gCndMaVEwx+b353yT+AyOKJw= - 1585 - text/xml - - - urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 - 1fab8bb0-cfaf-4225-ad6d-01768bc10470 - 1uPB643nrQfpY+Y0AypGko+PiPE= - 26080 - application/mxf - - - urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9 - 9482e87d-292d-4e0e-a98d-c61822b60fe9 - ifmC1P7fjigb1oVxx6xs3Paz/GY= - 161326 - application/mxf - - - diff --git a/test/ref/DCP/dcp_test2/ASSETMAP.xml b/test/ref/DCP/dcp_test2/ASSETMAP.xml index 7fa49616..bbe4f7eb 100644 --- a/test/ref/DCP/dcp_test2/ASSETMAP.xml +++ b/test/ref/DCP/dcp_test2/ASSETMAP.xml @@ -1,6 +1,6 @@ - urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d + urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55 Created by libdcp OpenDCP 0.0.25 1 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55 + urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09 true - pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml + pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml 1 0 1186 diff --git a/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml index 61922e17..aea8304a 100644 --- a/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ b/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -14,7 +14,7 @@ - urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09 + urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 diff --git a/test/ref/DCP/dcp_test2/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml b/test/ref/DCP/dcp_test2/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml deleted file mode 100644 index 6708f741..00000000 --- a/test/ref/DCP/dcp_test2/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55 - 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 - pqdZpLFIn6kcClkACI9VLGCzNgk= - 1770 - text/xml - - - urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 - 1fab8bb0-cfaf-4225-ad6d-01768bc10470 - ErlJmAfNakirQq9kVrnPj7fIOw0= - 35032 - application/mxf - - - urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 - 8b92bcee-62fc-4a33-a51a-816e9611ce85 - fnl4pJDAQk/xQ54W4R+l6S7PB7E= - 161326 - application/mxf - - - diff --git a/test/ref/DCP/dcp_test2/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml b/test/ref/DCP/dcp_test2/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml new file mode 100644 index 00000000..00206f96 --- /dev/null +++ b/test/ref/DCP/dcp_test2/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml @@ -0,0 +1,31 @@ + + + urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09 + 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 + hBXFu2pGlUzKmLLNe6LLkqIOnoA= + 1770 + text/xml + + + urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 + 1fab8bb0-cfaf-4225-ad6d-01768bc10470 + ErlJmAfNakirQq9kVrnPj7fIOw0= + 35032 + application/mxf + + + urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 + 8b92bcee-62fc-4a33-a51a-816e9611ce85 + fnl4pJDAQk/xQ54W4R+l6S7PB7E= + 161326 + application/mxf + + + diff --git a/test/ref/DCP/dcp_test5/ASSETMAP.xml b/test/ref/DCP/dcp_test5/ASSETMAP.xml index a5be569a..f0391eb3 100644 --- a/test/ref/DCP/dcp_test5/ASSETMAP.xml +++ b/test/ref/DCP/dcp_test5/ASSETMAP.xml @@ -1,6 +1,6 @@ - urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c + urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d Created by libdcp OpenDCP 0.0.25 1 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d + urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55 true - pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml + pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml 1 0 1186 diff --git a/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml index 4eafc4c2..345ae932 100644 --- a/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ b/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -14,7 +14,7 @@ - urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55 + urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09 urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 diff --git a/test/ref/DCP/dcp_test5/pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml b/test/ref/DCP/dcp_test5/pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml deleted file mode 100644 index dd0f69eb..00000000 --- a/test/ref/DCP/dcp_test5/pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d - 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 - yymWSY7jL4TWqI1Sy/Q2oUK1GX8= - 2152 - text/xml - - - urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 - 1fab8bb0-cfaf-4225-ad6d-01768bc10470 - 1uPB643nrQfpY+Y0AypGko+PiPE= - 26080 - application/mxf - - - urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9 - 9482e87d-292d-4e0e-a98d-c61822b60fe9 - ifmC1P7fjigb1oVxx6xs3Paz/GY= - 161326 - application/mxf - - - diff --git a/test/ref/DCP/dcp_test5/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml b/test/ref/DCP/dcp_test5/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml new file mode 100644 index 00000000..b7696dfb --- /dev/null +++ b/test/ref/DCP/dcp_test5/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml @@ -0,0 +1,31 @@ + + + urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55 + 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 + e3Gy1PLmR1iRdzDPzy3jqxZ/yLk= + 2152 + text/xml + + + urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 + 1fab8bb0-cfaf-4225-ad6d-01768bc10470 + 1uPB643nrQfpY+Y0AypGko+PiPE= + 26080 + application/mxf + + + urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9 + 9482e87d-292d-4e0e-a98d-c61822b60fe9 + ifmC1P7fjigb1oVxx6xs3Paz/GY= + 161326 + application/mxf + + + diff --git a/test/ref/DCP/dcp_test7/ASSETMAP b/test/ref/DCP/dcp_test7/ASSETMAP index 92ef4e38..4a2bb306 100644 --- a/test/ref/DCP/dcp_test7/ASSETMAP +++ b/test/ref/DCP/dcp_test7/ASSETMAP @@ -1,6 +1,6 @@ - urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55 + urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09 Created by libdcp 1 2012-07-17T04:45:18+00:00 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09 + urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 true - pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml + pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml 1 0 1253 diff --git a/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml index 24a8419c..4cce722e 100644 --- a/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ b/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -14,7 +14,7 @@ - urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 + urn:uuid:8e293965-f8ad-48c6-971d-261b01f65cdb urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 diff --git a/test/ref/DCP/dcp_test7/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml b/test/ref/DCP/dcp_test7/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml new file mode 100644 index 00000000..f526f380 --- /dev/null +++ b/test/ref/DCP/dcp_test7/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml @@ -0,0 +1,31 @@ + + + urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 + 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 + 6pwcsW6Ysnzp0U5khSsM4vYe5bM= + 1587 + text/xml;asdcpKind=CPL + + + urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 + 1fab8bb0-cfaf-4225-ad6d-01768bc10470 + 1uPB643nrQfpY+Y0AypGko+PiPE= + 26080 + application/x-smpte-mxf;asdcpKind=Picture + + + urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9 + 9482e87d-292d-4e0e-a98d-c61822b60fe9 + ifmC1P7fjigb1oVxx6xs3Paz/GY= + 161326 + application/x-smpte-mxf;asdcpKind=Sound + + + diff --git a/test/ref/DCP/dcp_test7/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml b/test/ref/DCP/dcp_test7/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml deleted file mode 100644 index 70c4fb56..00000000 --- a/test/ref/DCP/dcp_test7/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09 - 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 - W4fAVf4nVZNfwWd25Vu1WtsFnUQ= - 1587 - text/xml;asdcpKind=CPL - - - urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 - 1fab8bb0-cfaf-4225-ad6d-01768bc10470 - 1uPB643nrQfpY+Y0AypGko+PiPE= - 26080 - application/x-smpte-mxf;asdcpKind=Picture - - - urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9 - 9482e87d-292d-4e0e-a98d-c61822b60fe9 - ifmC1P7fjigb1oVxx6xs3Paz/GY= - 161326 - application/x-smpte-mxf;asdcpKind=Sound - - - diff --git a/test/ref/DCP/encryption_test/ASSETMAP.xml b/test/ref/DCP/encryption_test/ASSETMAP.xml index 3f189256..3eb1900c 100644 --- a/test/ref/DCP/encryption_test/ASSETMAP.xml +++ b/test/ref/DCP/encryption_test/ASSETMAP.xml @@ -1,6 +1,6 @@ - urn:uuid:5d51e8a1-b2a5-4da6-9b66-4615c3609440 + urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f 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:93182bd2-b1e8-41a3-b5c8-6e6564273bff true - pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml + pkl_93182bd2-b1e8-41a3-b5c8-6e6564273bff.xml 1 0 8708 diff --git a/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml index a2dc3bf4..6f77e1d6 100644 --- a/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ b/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -14,7 +14,7 @@ - urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff + urn:uuid:793170e7-e913-404b-8942-1c7f2e5cf012 urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 @@ -59,15 +59,15 @@ - IANIEQpHSdKYpetv7vU8c9NL55g= + vUKHL/1VIgu6pX+GLoHag/nZXqQ= - elcV7C8ITQPME2EnZCld1/NPFi5KXzSEWGDEchEfHryc6kLx2ZY1yl/uylaHgY0R -Z37ida9b0wPySJzr5vbTRerIHF/S2asXtGC1kgo5MWtXgATUtUe031HJ+TJPi9bj -SD0u1V+PciElYwPRHID27kpLVgdSoq6cNoYG2w4yNvtnyF5r+n+0IiCYNMlkVqGW -gX2Lfa/Oy8bJbioOo5yHt+6sFSPAp7GJdTEtzOEiKAkaLpymAB7N3L3gW2qS6OnL -2KspdXdR3WKqPEprf3A0OtWTjbfsuvsyleCl/gw4O2dMRFbc1R0OutsWVw1h8PXl -UtAYFxwdlY7ile2ZCelQMA== + DWmEtKozmtao3qdXOU7kQze+SIRh8gml2OrliFT+8U9xjBbUdLXWBPgTQuuVPI8u +iHxVoc7cLKxOGuB7EXMl1EWwsm62y+I6/NEWfjV8EKkgHuhGE0TV/++5E0i/Dg/q +Eq1whVbQ/EorYUea0/mW2UAgovKiz0MwQgyQb6Jgpy0O3PuNDrSlWeo3DUTFQiF8 +saaliNHSNXC8DEoNDnfSzAesL9jt6W4IEDPQp0rean7u4/0EhISlFMvea2YFiuCo ++/IZtb2tWtHMLx4mU7g1eLeGcNc2fWSygAs+pdPemoFX82r7Y9YTepZAbwhrvhFk +kkgV/08P+RZE3ftF1pQ00g== diff --git a/test/ref/DCP/encryption_test/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml b/test/ref/DCP/encryption_test/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml deleted file mode 100644 index fdfb170d..00000000 --- a/test/ref/DCP/encryption_test/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml +++ /dev/null @@ -1,152 +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 - dhoWJ3yykLSeAOQVOUNvMxsiljk= - 9310 - text/xml - - - urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 - 46c3eb45-15e5-47d6-8684-d8641e4dc516 - EdbLFybsoLbZ3KB2jFtWZxMEMHI= - 29896 - application/mxf - - - urn:uuid:d5f633d3-cb6e-4c04-85ae-4b2da9422852 - d5f633d3-cb6e-4c04-85ae-4b2da9422852 - h7XEYV80a8CvQ5wS1OR3ldbkLM4= - 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 - - - - - - - - - - - - 92Er8kJ8u9u76Fb1EUNVyeblJd0= - - - SdxywkzTQtRWscRC9dmEoepc2dJ9cIi/GShodKNcRAYJBpm+zqpMCJ3wDT3q+pvT -igG/hnkMRKQlAjK1I/VBEUGfEisl8QAerme8ff+GzY9vYlPoTyGQnqrNY+JBeir7 -r46JELWAxiRa+bMM/Dw3PLrRtQ/0EtZIcPNrJ6K+VeYHjV9KaaFXB740bJ1emVtY -BqaAyXG2gk/4v1TFf19IBNH0cwu/nwJ7Cg6Xp2dKkRqtmOITYdxV9Ro/FxPs0M4Q -vuwoOUJQxtgs4WgvGwHAvzTkyr6E5tX7z0uh5YEbH5/IX8l1fOvMi3LHK0E77d5k -8IdST9nHTtvpHrJgsDUI4A== - - - - 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_93182bd2-b1e8-41a3-b5c8-6e6564273bff.xml b/test/ref/DCP/encryption_test/pkl_93182bd2-b1e8-41a3-b5c8-6e6564273bff.xml new file mode 100644 index 00000000..5affb3a4 --- /dev/null +++ b/test/ref/DCP/encryption_test/pkl_93182bd2-b1e8-41a3-b5c8-6e6564273bff.xml @@ -0,0 +1,152 @@ + + + urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff + 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 + 9sunXON1YDsep+RAReRz3aLnadY= + 9310 + text/xml + + + urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 + 46c3eb45-15e5-47d6-8684-d8641e4dc516 + EdbLFybsoLbZ3KB2jFtWZxMEMHI= + 29896 + application/mxf + + + urn:uuid:d5f633d3-cb6e-4c04-85ae-4b2da9422852 + d5f633d3-cb6e-4c04-85ae-4b2da9422852 + h7XEYV80a8CvQ5wS1OR3ldbkLM4= + 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 + + + + + + + + + + + + YZJkjLwee6xcN8jEcZcyrZ/ZSGo= + + + NQ0UGAcWKlLWt1I0Baxt1lKxc0AmfLWsJ4Hnfn2FgZ0x07gR/GwP552ZfgQDG7Cx +/wRey1Cg7AAd6I6keV9kKyB1sPrDND6DQaXfS3ymmcaOtCcGa2Wt3hybwVWN67Uw +EQFHAOwC5iwgTLLpW43OtBUY65qcXyVMuOgmENjiaocu+D9lTV5nraxNbFvFlBel +0AazpjWkevFK2v32SxzINBy2yOpqEpz1vax2hYSPMGWj5anf2Bckd3HDzl9KAHYl +WZKO56Ad49/8QMFGcbOlpAA74EgOW9jidd0HIgkyDl7tE8bFfzOfNeo9n6AcO5wF +79YV+reJM/J0381W8OaN+Q== + + + + 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/write_interop_subtitle_test3/ASSETMAP b/test/ref/write_interop_subtitle_test3/ASSETMAP index 9c8e07c5..dfcc1bc9 100644 --- a/test/ref/write_interop_subtitle_test3/ASSETMAP +++ b/test/ref/write_interop_subtitle_test3/ASSETMAP @@ -1,6 +1,6 @@ - urn:uuid:47a8e83e-fd5f-445d-a1bc-9f59c5289c34 + urn:uuid:e94b8a0d-27f7-408a-af16-78d3df419a91 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:6a9e31a6-50a4-4ecb-8683-fa667848470a true - pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml + pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml 1 0 1114 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 new file mode 100644 index 00000000..0277187c --- /dev/null +++ b/test/ref/write_interop_subtitle_test3/cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml @@ -0,0 +1,31 @@ + + + urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 + Created by libdcp + 2018-09-02T04:45:18+00:00 + libdcp + libdcp + My film + feature + + urn:uuid:e98d059d-645f-4343-a30f-edc61d58b8e0 + 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_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml b/test/ref/write_interop_subtitle_test3/cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml deleted file mode 100644 index 0f2e8d70..00000000 --- a/test/ref/write_interop_subtitle_test3/cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - urn:uuid:f28b567b-3b9a-417a-aee4-6fc1a2c6a3af - Created by libdcp - 2018-09-02T04:45:18+00:00 - libdcp - libdcp - My film - feature - - urn:uuid:9f134b47-ab8d-4c3c-adbf-f494b1544283 - foo - - - - - urn:uuid:ab16cd50-686f-4015-9498-4a142ecb0696 - - - urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6 - - 24 1 - 6046 - 0 - 6046 - rl+eBdjvZ0xaaaABGCpf6cm9G/Q= - - - - - 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 new file mode 100644 index 00000000..89b53cf2 Binary files /dev/null and b/test/ref/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png differ diff --git a/test/ref/write_interop_subtitle_test3/ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png b/test/ref/write_interop_subtitle_test3/ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png deleted file mode 100644 index 89b53cf2..00000000 Binary files a/test/ref/write_interop_subtitle_test3/ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png and /dev/null differ diff --git a/test/ref/write_interop_subtitle_test3/pkl.xml b/test/ref/write_interop_subtitle_test3/pkl.xml index 3f38ee57..23d28034 120000 --- a/test/ref/write_interop_subtitle_test3/pkl.xml +++ b/test/ref/write_interop_subtitle_test3/pkl.xml @@ -1 +1 @@ -pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml \ No newline at end of file +pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml \ No newline at end of file diff --git a/test/ref/write_interop_subtitle_test3/pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml b/test/ref/write_interop_subtitle_test3/pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml new file mode 100644 index 00000000..5e721188 --- /dev/null +++ b/test/ref/write_interop_subtitle_test3/pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml @@ -0,0 +1,30 @@ + + + urn:uuid:6a9e31a6-50a4-4ecb-8683-fa667848470a + Created by libdcp + 2018-09-02T04:45:18+00:00 + libdcp + libdcp + + + urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 + 46c3eb45-15e5-47d6-8684-d8641e4dc516 + hu0RaV4ZgrcqQQtgOW4r/YznVo0= + 1105 + text/xml;asdcpKind=CPL + + + urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6 + a6c58cff-3e1e-4b38-acec-a42224475ef6 + cVnFjMLTQnSIAlIzJpNB/p7B230= + 414 + text/xml;asdcpKind=Subtitle + + + urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71 + w0Xc4TUYpao08I0yPSDfFkaEwdg= + 44935 + 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 368c9f24..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 - P2gjv5LMQFMu0BH4RLAfFVVXNRA= - 1105 - text/xml;asdcpKind=CPL - - - urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6 - a6c58cff-3e1e-4b38-acec-a42224475ef6 - cVnFjMLTQnSIAlIzJpNB/p7B230= - 414 - text/xml;asdcpKind=Subtitle - - - urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71 - w0Xc4TUYpao08I0yPSDfFkaEwdg= - 44935 - image/png - - - diff --git a/test/verify_test.cc b/test/verify_test.cc index e025a013..f1213c10 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE (verify_test1) list notes = dcp::verify (directories, &stage, &progress, xsd_test); boost::filesystem::path const cpl_file = "build/test/verify_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml"; - boost::filesystem::path const pkl_file = "build/test/verify_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml"; + boost::filesystem::path const pkl_file = "build/test/verify_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml"; boost::filesystem::path const assetmap_file = "build/test/verify_test1/ASSETMAP.xml"; list > >::const_iterator st = stages.begin(); @@ -213,7 +213,7 @@ BOOST_AUTO_TEST_CASE (verify_test3) vector directories = setup (1, 3); { - Editor e ("build/test/verify_test3/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml"); + Editor e ("build/test/verify_test3/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml"); e.replace ("", "x"); } @@ -271,7 +271,7 @@ static boost::filesystem::path pkl (int n) { - return dcp::String::compose("build/test/verify_test%1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml", n); + return dcp::String::compose("build/test/verify_test%1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml", n); } static @@ -428,7 +428,7 @@ BOOST_AUTO_TEST_CASE (verify_test11) { check_after_replace ( 11, &pkl, - "urn:uuid:ae8", "urn:uuid:xe8", + "urn:uuid:18b", "urn:uuid:x8b", dcp::VerificationNote::XML_VALIDATION_ERROR ); } @@ -438,7 +438,7 @@ BOOST_AUTO_TEST_CASE (verify_test12) { check_after_replace ( 12, &asset_map, - "urn:uuid:74e", "urn:uuid:x4e", + "urn:uuid:ae8", "urn:uuid:xe8", dcp::VerificationNote::XML_VALIDATION_ERROR ); } diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc index 30220420..dd51d919 100644 --- a/test/write_subtitle_test.cc +++ b/test/write_subtitle_test.cc @@ -391,7 +391,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3) check_xml ( dcp::file_to_string("test/ref/write_interop_subtitle_test3/pkl.xml"), - dcp::file_to_string("build/test/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml"), + dcp::file_to_string("build/test/write_interop_subtitle_test3/pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml"), list() ); } -- cgit v1.2.3