From 06c02f781597a5679c9a2fcdc7a7c9f79f58f6f4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 16 Oct 2023 23:13:10 +0200 Subject: [PATCH] Don't write MCA subdescriptors for channels that don't exist in the MXF (#2631). This causes some test ID churn. --- src/sound_asset_writer.cc | 8 +++ test/data/DCP/ASSETMAP.xml | 56 ++++++++++++++++++ test/data/DCP/VOLINDEX.xml | 4 ++ test/data/DCP/audio.mxf | Bin 0 -> 161326 bytes ...l_6affb8ee-0020-4dff-a53c-17652f6358ab.xml | 49 +++++++++++++++ ..._d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml} | 6 +- test/data/DCP/video.mxf | Bin 0 -> 40144 bytes test/ref/DCP/dcp_test2/ASSETMAP.xml | 6 +- test/ref/DCP/dcp_test2/audio.mxf | Bin 161326 -> 161326 bytes ...l_6affb8ee-0020-4dff-a53c-17652f6358ab.xml | 4 +- ..._8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml} | 6 +- test/ref/DCP/dcp_test5/ASSETMAP.xml | 6 +- test/ref/DCP/dcp_test5/audio.mxf | Bin 161326 -> 161326 bytes ...l_6affb8ee-0020-4dff-a53c-17652f6358ab.xml | 4 +- ...l_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml | 34 +++++++++++ test/ref/DCP/encryption_test/ASSETMAP.xml | 6 +- test/ref/DCP/encryption_test/audio.mxf | Bin 165454 -> 165454 bytes ...l_6affb8ee-0020-4dff-a53c-17652f6358ab.xml | 18 +++--- ..._5203f3d4-9d62-4062-8bf1-7a114eff99df.xml} | 20 +++---- 19 files changed, 189 insertions(+), 38 deletions(-) create mode 100644 test/data/DCP/ASSETMAP.xml create mode 100644 test/data/DCP/VOLINDEX.xml create mode 100644 test/data/DCP/audio.mxf create mode 100644 test/data/DCP/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml rename test/{ref/DCP/dcp_test5/pkl_017b3de4-6dda-408d-b19b-6711354b0bc3.xml => data/DCP/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml} (88%) create mode 100644 test/data/DCP/video.mxf rename test/ref/DCP/dcp_test2/{pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml => pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml} (88%) create mode 100644 test/ref/DCP/dcp_test5/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml rename test/ref/DCP/encryption_test/{pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml => pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml} (93%) diff --git a/src/sound_asset_writer.cc b/src/sound_asset_writer.cc index 9ec93924..3ea2243b 100644 --- a/src/sound_asset_writer.cc +++ b/src/sound_asset_writer.cc @@ -211,6 +211,14 @@ LIBDCP_ENABLE_WARNINGS std::sort(dcp_channels.begin(), dcp_channels.end()); dcp_channels.erase(std::unique(dcp_channels.begin(), dcp_channels.end()), dcp_channels.end()); + /* Remove channels that aren't actually in this MXF at all */ + dcp_channels.erase( + std::remove_if(dcp_channels.begin(), dcp_channels.end(), [this](dcp::Channel channel) { + return static_cast(channel) >= _asset->channels(); + }), + dcp_channels.end() + ); + for (auto dcp_channel: dcp_channels) { auto channel = new ASDCP::MXF::AudioChannelLabelSubDescriptor(asdcp_smpte_dict); GenRandomValue (channel->MCALinkID); diff --git a/test/data/DCP/ASSETMAP.xml b/test/data/DCP/ASSETMAP.xml new file mode 100644 index 00000000..e5bee939 --- /dev/null +++ b/test/data/DCP/ASSETMAP.xml @@ -0,0 +1,56 @@ + + + urn:uuid:76aef948-ca63-4d4a-b707-27727c55d370 + Created by libdcp + OpenDCP 0.0.25 + 1 + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + + + urn:uuid:d76fdaaf-8316-42dc-a87e-1719ad6ca3ca + true + + + pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml + 1 + 0 + 1380 + + + + + urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab + + + cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml + 1 + 0 + 2024 + + + + + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 + + + video.mxf + 1 + 0 + 40144 + + + + + urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa + + + audio.mxf + 1 + 0 + 161326 + + + + + diff --git a/test/data/DCP/VOLINDEX.xml b/test/data/DCP/VOLINDEX.xml new file mode 100644 index 00000000..f66c004a --- /dev/null +++ b/test/data/DCP/VOLINDEX.xml @@ -0,0 +1,4 @@ + + + 1 + diff --git a/test/data/DCP/audio.mxf b/test/data/DCP/audio.mxf new file mode 100644 index 0000000000000000000000000000000000000000..947865e13c45feda38d3492e41ad035d5fc4f4a7 GIT binary patch literal 161326 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 F{{c=O>1+T1 literal 0 HcmV?d00001 diff --git a/test/data/DCP/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/data/DCP/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml new file mode 100644 index 00000000..5fa3643b --- /dev/null +++ b/test/data/DCP/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:8577c7c0-be29-4eb5-a449-1e3870a42bbd + + + 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 + l+XLgxe2fMZDgY+0QYzDfGhvTQM= + + + 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/data/DCP/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml similarity index 88% rename from test/ref/DCP/dcp_test5/pkl_017b3de4-6dda-408d-b19b-6711354b0bc3.xml rename to test/data/DCP/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml index 9b388774..49fd579b 100644 --- a/test/ref/DCP/dcp_test5/pkl_017b3de4-6dda-408d-b19b-6711354b0bc3.xml +++ b/test/data/DCP/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml @@ -1,6 +1,6 @@ - urn:uuid:017b3de4-6dda-408d-b19b-6711354b0bc3 + urn:uuid:d76fdaaf-8316-42dc-a87e-1719ad6ca3ca Created by libdcp 2012-07-17T04:45:18+00:00 OpenDCP 0.0.25 @@ -9,7 +9,7 @@ urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab 6affb8ee-0020-4dff-a53c-17652f6358ab - kiv8PHo8XZc/lI2xk7qYghrP2SA= + eqEIVxSAbJL+SROmqrDHbr9sb+A= 2024 text/xml cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -25,7 +25,7 @@ urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa 97f0f352-5b77-48ee-a558-9df37717f4fa - wLbXcpQtWt2IFMHIcibxwND667I= + l+XLgxe2fMZDgY+0QYzDfGhvTQM= 161326 application/mxf audio.mxf diff --git a/test/data/DCP/video.mxf b/test/data/DCP/video.mxf new file mode 100644 index 0000000000000000000000000000000000000000..f3e7588b8d13ba259ab6a7def2a54fc0b9f73e72 GIT binary patch literal 40144 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 XJeS%8ti^OHjbsqdij#=tBk}(M>h73{ literal 0 HcmV?d00001 diff --git a/test/ref/DCP/dcp_test2/ASSETMAP.xml b/test/ref/DCP/dcp_test2/ASSETMAP.xml index 68d9a5cb..b32d045c 100644 --- a/test/ref/DCP/dcp_test2/ASSETMAP.xml +++ b/test/ref/DCP/dcp_test2/ASSETMAP.xml @@ -1,6 +1,6 @@ - urn:uuid:017b3de4-6dda-408d-b19b-6711354b0bc3 + urn:uuid:d76fdaaf-8316-42dc-a87e-1719ad6ca3ca Created by libdcp OpenDCP 0.0.25 1 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:d199d58b-5ef8-4d49-b270-07e590ccb280 + urn:uuid:8577c7c0-be29-4eb5-a449-1e3870a42bbd true - pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml + pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml 1 0 1380 diff --git a/test/ref/DCP/dcp_test2/audio.mxf b/test/ref/DCP/dcp_test2/audio.mxf index 4416225c59938e85a32aaf42cfecd9d415db5e2c..e8bd446f9754f44fa41c2037c87334d3a092fc54 100644 GIT binary patch delta 68 zcmZ4YhI8E;&JA_^OboXsH}H$IYA`S`FioDrud-P{UUD9GB-K2IWTT>VA3-K0E=o7l>h($ delta 792 zcmZ4YhI8E;&JA_^OpIES8~DXpD;O9U*eB27R|#k>KYn1Jrr*{jo^loiOSJcvt^4V5 zD%sa-JG**OP3Yx<)9>CleBR^2zSmnXB>z>W>pA|Qs^xOt2}@VsnwxvQL+_%1_TSV) zZZWHk6}Zm1{rS520RIfedZu7TMqWk`$Yy9}V5qd=Vh}*L>Hj|l0X9Bu6BeLSW+p}^ zppzK>|78%k*^&5S-5+P$dDFyQpYLLx_x}$A8$&Wf21C&Q-wa#~K@6D;=|En||DOyj zKrKxFe=)G8=IOdS{r|xrkj?h*4CnR9UV?n+Zm0&i0o`|KZeWJF;d=h9_03{VcUIJi zORmjXdO$D;cNE;-M|G72OkDE23Mdv*cc!zNI0-yxBz=Nbc4bHJr>d2zzTCiSjLja znvM=joAQp-Dm7WY1iFC(>V{&V3#5Q9NM%R^hJ*q`FheOr5fJ7B={$xMXt=QcpKKwh zfF2ILAUB|=95gqu!Q8OH=lOB_`L2hy^DOvu>i6S`a5n@ofZQO1ND(+)!N@k*Tu`4$ VJAQMaV7zvdLz@HRHU}m>GXSvT07w7; 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 index d9eb222e..52a7779a 100644 --- 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 @@ -14,7 +14,7 @@ - urn:uuid:3b198cbc-c1d2-4410-805c-397b6fea0297 + urn:uuid:d98861e8-aefc-433d-9e96-1745e7ba039e urn:uuid:fc843acc-1ad9-4808-b9ed-33f5319e047d @@ -22,7 +22,7 @@ 24 0 24 - 3PtaGoYcvBdq5WYiK0cmeDwm8d0= + NzWhEbTccUIh1sSXIbU+8POVui0= urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 diff --git a/test/ref/DCP/dcp_test2/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml b/test/ref/DCP/dcp_test2/pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml similarity index 88% rename from test/ref/DCP/dcp_test2/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml rename to test/ref/DCP/dcp_test2/pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml index 44da5c43..061e8a6a 100644 --- a/test/ref/DCP/dcp_test2/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml +++ b/test/ref/DCP/dcp_test2/pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml @@ -1,6 +1,6 @@ - urn:uuid:d199d58b-5ef8-4d49-b270-07e590ccb280 + urn:uuid:8577c7c0-be29-4eb5-a449-1e3870a42bbd Created by libdcp 2012-07-17T04:45:18+00:00 OpenDCP 0.0.25 @@ -9,7 +9,7 @@ urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab 6affb8ee-0020-4dff-a53c-17652f6358ab - 6F7kAEYbNdv6gz6PG5JcMjGF8kU= + zaAcrAcv0oOzOa3etTP6xDfzQko= 1686 text/xml cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -25,7 +25,7 @@ urn:uuid:fc843acc-1ad9-4808-b9ed-33f5319e047d fc843acc-1ad9-4808-b9ed-33f5319e047d - 3PtaGoYcvBdq5WYiK0cmeDwm8d0= + NzWhEbTccUIh1sSXIbU+8POVui0= 161326 application/mxf audio.mxf diff --git a/test/ref/DCP/dcp_test5/ASSETMAP.xml b/test/ref/DCP/dcp_test5/ASSETMAP.xml index 79a3091c..e5bee939 100644 --- a/test/ref/DCP/dcp_test5/ASSETMAP.xml +++ b/test/ref/DCP/dcp_test5/ASSETMAP.xml @@ -1,6 +1,6 @@ - urn:uuid:4f26ba15-f1bc-450a-aaeb-8a4801ce11d5 + urn:uuid:76aef948-ca63-4d4a-b707-27727c55d370 Created by libdcp OpenDCP 0.0.25 1 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:017b3de4-6dda-408d-b19b-6711354b0bc3 + urn:uuid:d76fdaaf-8316-42dc-a87e-1719ad6ca3ca true - pkl_017b3de4-6dda-408d-b19b-6711354b0bc3.xml + pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml 1 0 1380 diff --git a/test/ref/DCP/dcp_test5/audio.mxf b/test/ref/DCP/dcp_test5/audio.mxf index 499ea47ce39df36584fe47700f6a9d99eb3f74ca..947865e13c45feda38d3492e41ad035d5fc4f4a7 100644 GIT binary patch delta 68 zcmZ4YhI8E;&JA_^OboXsH}H$IYA`S`FioDrud-P{UUD9GB-K2IWTT>VA3-K0E=o7l>h($ delta 792 zcmZ4YhI8E;&JA_^OpIES8~DXpD;O9U*eB27R|&Y;k@#ZWA7|Tn)5Kk$?_!>JJ^$AF zW-+HbE9%50*XArfRVB(`!eZ`rvBjp%dwuxY{b3nP9&0)}EN#j=QmfQt`ErBL^W*mO zT@P*NS@7x9@5d82AK;(CSkDy9$jHkG0@)1B3=EYvTnqx}HvRv{Ai&0_ZNdUn%FM*b z1auO^|Gx|ZdlYTd?Cd@IR?fY7VXeWBpa1_burVYvWH1E%|INU~5X6wlkPhUP{Qt?o z0@T9v{}%&mYM!pU)Bhg~0(ak@vR$k^*-MZQ-3`?sH=z3t%?->jH?)=?Kd?{JZ|f3I zIg5fN+I!({a0a@8hryX4l_8Iz1V|P^UBQguipd^=0_bi4hXZRPzhi*_fpvNMb8(3j(IQ{N@ z!{FQf^bFX*k!QBwV0CIy2B1PbI1tZ&Jb3uJ3 V?fA`wg7Ml-4s8yM+Z>qm%m7KH17ZLG 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 index eb85a118..5fa3643b 100644 --- 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 @@ -14,7 +14,7 @@ - urn:uuid:d199d58b-5ef8-4d49-b270-07e590ccb280 + urn:uuid:8577c7c0-be29-4eb5-a449-1e3870a42bbd urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 @@ -32,7 +32,7 @@ 24 0 24 - wLbXcpQtWt2IFMHIcibxwND667I= + l+XLgxe2fMZDgY+0QYzDfGhvTQM= urn:uuid:b68febcc-5ddf-489a-84a7-924f29fa2afd diff --git a/test/ref/DCP/dcp_test5/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml b/test/ref/DCP/dcp_test5/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml new file mode 100644 index 00000000..49fd579b --- /dev/null +++ b/test/ref/DCP/dcp_test5/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml @@ -0,0 +1,34 @@ + + + urn:uuid:d76fdaaf-8316-42dc-a87e-1719ad6ca3ca + 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 + eqEIVxSAbJL+SROmqrDHbr9sb+A= + 2024 + text/xml + cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml + + + urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 + 5407b210-4441-4e97-8b16-8bdc7c12da54 + o3VmpdFsNUgF11oadcaGJ/IfO0M= + 40144 + application/mxf + video.mxf + + + urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa + 97f0f352-5b77-48ee-a558-9df37717f4fa + l+XLgxe2fMZDgY+0QYzDfGhvTQM= + 161326 + application/mxf + audio.mxf + + + diff --git a/test/ref/DCP/encryption_test/ASSETMAP.xml b/test/ref/DCP/encryption_test/ASSETMAP.xml index 902833dc..9abf60a6 100644 --- a/test/ref/DCP/encryption_test/ASSETMAP.xml +++ b/test/ref/DCP/encryption_test/ASSETMAP.xml @@ -1,6 +1,6 @@ - urn:uuid:460be38d-d560-455c-ad57-b2e80ca9b228 + urn:uuid:d060dec0-cb61-4ca0-8d12-39346c7ec9c5 Created by libdcp OpenDCP 0.0.25 1 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:93887017-5d6a-4ee5-b5f4-161b06281d0e + urn:uuid:5203f3d4-9d62-4062-8bf1-7a114eff99df true - pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml + pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml 1 0 8902 diff --git a/test/ref/DCP/encryption_test/audio.mxf b/test/ref/DCP/encryption_test/audio.mxf index 61839db4fe1f7a66640a6ad9e075cad5f451b7b9..a4f89ae9cbe765774fc673ab820b79acd075c5ef 100644 GIT binary patch delta 76 zcmV-S0JHzjj0(<-3b1q%9st@r3IGtWOy|cxpGCsA450GL`{R-S`2Z*Y0007$k`g4d i1{0V8lZO`$0xP1kp%-5$v#=LK1A;(?KmoQu0!~J})*T@L delta 810 zcmX@t!*#BQYeR{U9HW*E7lXhCpXbNz=er)-&a>dtso#$${{P8P!N9=4K6#RmN}Rtft3pLu`Yp?p899RC?Ja$5eaUGVm};;V?roEYbidpEDr-OlP(GvVZO ztCS>1#;)oucSVXDZ?OHEzWL^I$Br%8rxTlMKd;}sO=t#VJyS3vBQGNeWHU4~FjRt^ zfo{|P9}EI)eA*@~K&8w~j7&f$G5r6|Ai%jk-@R+K@6)L~B2On6F)IB3#=ypq%#gtl z^#3aZ7ef$3CPO-qSMvWe0}D_K)Bi6Ftf_gr?oR(dF$h>o_Ut)$X|jU|AG#Z=L2f|z z9hw`MVQ#pPaPPqBM4tt{LY5{ubtjL)-QWy#0}q2ULn=caLkW;9g1Ukk!xfY5L? z01gNA5JhtX$WP#Kc=dj=`j>~!le^+Qs=x1ZNdUTm3mgtU3~mgrKzFb)Kvm$>*bL$qh)84v3H*i4RPz-c|6wn2!3~9iSP+$mV zC}k)D!h9f|$B+UI7uNri^+XiV!=V@C2K1DJ<_0#H8&1UEGYhtI{=MXtlE$n*C*t95 n2x0)aK?ac`aJqt#ZL+S2K9fe~=0uT9jV6aS2gYp - urn:uuid:c1d35c2a-39c5-46b8-bbeb-7a1cdffff013 + urn:uuid:09af6f47-8aab-4de5-950c-14e590320120 urn:uuid:9a7fbb03-4078-4944-90b1-0d8a21c9d793 @@ -34,7 +34,7 @@ 0 24 urn:uuid:7ab6c77b-6648-44b9-8549-a5290ada6238 - lS+FKcwLD7cRjgZMQ+hvGg/yJIc= + 3o02UpYqrl6w0NQbFvrB2tKxaIk= @@ -57,15 +57,15 @@ - i2q8BhQwGZp0cROMkuiI4sE0e9w= + X3YkODMLyEJsAz5v3S/uT+xDD7c= - xGQzQKVoTFElGV0kBwORWtYhTLCJKXDBV39XgZ1J/HRBcFiO4e58MSc+5Gi8mJ0W -c+m8eB5Y6ti6ATFnPQTt9l/FdoqUgzHtPXMPMPU9sS7HSjY4Qew6iqpzX2Sb5A76 -k30dn4nHSXZ25WwU09gKg4pzCIv25loY2mwgqXiDXeLv2FTyexmM2jKP6og49Yc9 -skpg90alEYWXef99bErVVrXMzBc6QHh+cvWx+X2TRGjnerjxr5aCal8+BvdG6VMK -9p4kOsMiQ8xBblquizC6rXXT96iV+Ov1wPuLNFCO3M60pApUamefCqzQ7wCEfsGg -ZhNxhu99RxfV9l4HXNvV9g== + jH02vGxlTTi9T94KCIfMkafmdO0wluP9cvh+u5HyYoZo/D7O1Ki202t5uHRp0wcu +OfBFuu1Hw3Ooy/VEa2l4l/UDfE7lI+D79e0VfA8HwFB+c21GF7Q2FRV5ddu9ODgz +rk6kC5fZSLxc7cpK6jPNnT285O3nHfjk6MQ0fgGfNbvMefgeEWVKj8qcyFgN6H4e +wr1omcjbdw/HVQaOW84//pBRSRdMJGe1u2iUE2RwxBLzP4BepzkMv9Asm6uDo1YG +X1d60g2aCUdxAg9fjyTaOss1nRp1YdPlb3SHUhKXgTT/eAPkmmr7bs3jJtp2BN9U +4Izz2GR/3Uyf0NP20mZgNQ== diff --git a/test/ref/DCP/encryption_test/pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml b/test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml similarity index 93% rename from test/ref/DCP/encryption_test/pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml rename to test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml index db5b78f2..4d49b259 100644 --- a/test/ref/DCP/encryption_test/pkl_93887017-5d6a-4ee5-b5f4-161b06281d0e.xml +++ b/test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml @@ -1,6 +1,6 @@ - urn:uuid:93887017-5d6a-4ee5-b5f4-161b06281d0e + urn:uuid:5203f3d4-9d62-4062-8bf1-7a114eff99df Created by libdcp 2012-07-17T04:45:18+00:00 OpenDCP 0.0.25 @@ -9,7 +9,7 @@ urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab 6affb8ee-0020-4dff-a53c-17652f6358ab - ocIgRDFtEn7QPxwcqXYVpSrTPpI= + Zd9zaFAGx/4W2B3vSZkAqTzcDZ0= 9226 text/xml cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -25,7 +25,7 @@ urn:uuid:ce300880-a425-40a6-adac-eb1e3f5643fc ce300880-a425-40a6-adac-eb1e3f5643fc - lS+FKcwLD7cRjgZMQ+hvGg/yJIc= + 3o02UpYqrl6w0NQbFvrB2tKxaIk= 165454 application/mxf audio.mxf @@ -49,15 +49,15 @@ - G6rpYhOo/0ZdBo+SI3UzyPQA/F0= + 0F1ZXfoRDPIQHlRG0MC1uXkahG8= - tdapJHKPEmEa552oOg9s3/Q4TcnzIiNfd3U+xiSG5XGl+7K0n6JKbpNVgm4KpE0l -a7bVsu4Yp0ftCrcjxxczZ/puS7nVC/zcfk63miZcJKdXem0xt0AZJHEguwQq74Tc -48Efe1/MtIBCOtQErh2kcDVwXOUo6Nz0yW1g5PRQ5u9KlqQ67RLqDWRdX1OkWIUZ -Z2Iz2nSnTP4GDDHs5pX6xxZKNlgZIa5iYMBp97X1DGlGaQ2o/sbcUysE4g4oO+iU -cfRdkI68vj53hHWApxVGoAPAl4t8B6kMbLQAp1w4R/4ruLR9FKTffqRlUjOXtyiT -pQVNxwCU50/opyfv8v2v6w== + u98MLscN/Fn3YxGFMw6kP7fIWUj05FPxQvIYvsIpP68UP3FX9rdP6nh3Olyv194d +A1fQJu4ZamTcYN2O2E5vdGjxxHlPNXfFPckWc9Sy1i3V8u+EFdOggjMY4snvPot6 +kMyzAICuKzTJs4l+O/BzJAJSFSxrEtBCYEFxrtyKntDxSUE7ePSqPwcim6+5BzDO +QOsIp3wjJHlp7u4QqU3knIiaM7SibIXqtIBF7TOrChWZjFImKePNib9/DXvnE2WL +Y+5wJjGhImQR+2U2DDpSCLkl0kVgDrYfKcNg4lXUDZGEKo0Yqz0+1Rszz/DqsC+J +6mYxqMMvRXeh9pViSpgKaA== -- 2.30.2