From 4b2b565a03f26c399960416efeed300dd80e401b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 21 Sep 2020 00:53:55 +0200 Subject: Adapt for changes in parent branch, and test churn. --- test/ref/DCP/dcp_test1/ASSETMAP.xml | 6 ++-- test/ref/DCP/dcp_test1/audio.mxf | Bin 161326 -> 161326 bytes .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 4 +-- .../pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml | 31 --------------------- .../pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml | 31 +++++++++++++++++++++ test/ref/DCP/dcp_test7/ASSETMAP | 6 ++-- test/ref/DCP/dcp_test7/audio.mxf | Bin 161326 -> 161326 bytes .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 4 +-- .../pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml | 31 --------------------- .../pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml | 31 +++++++++++++++++++++ 10 files changed, 72 insertions(+), 72 deletions(-) delete mode 100644 test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml create mode 100644 test/ref/DCP/dcp_test1/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml delete mode 100644 test/ref/DCP/dcp_test7/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml create mode 100644 test/ref/DCP/dcp_test7/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml (limited to 'test/ref/DCP') diff --git a/test/ref/DCP/dcp_test1/ASSETMAP.xml b/test/ref/DCP/dcp_test1/ASSETMAP.xml index 401c6c6d..cf2fdaa7 100644 --- a/test/ref/DCP/dcp_test1/ASSETMAP.xml +++ b/test/ref/DCP/dcp_test1/ASSETMAP.xml @@ -1,6 +1,6 @@ - urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09 + urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430 Created by libdcp OpenDCP 0.0.25 1 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 + urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c true - pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml + pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml 1 0 1186 diff --git a/test/ref/DCP/dcp_test1/audio.mxf b/test/ref/DCP/dcp_test1/audio.mxf index 62158f3f..b58ff436 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_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml index 682ae510..042b7be2 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:8e293965-f8ad-48c6-971d-261b01f65cdb + urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 @@ -34,7 +34,7 @@ 24 0 24 - ifmC1P7fjigb1oVxx6xs3Paz/GY= + cb1OLhgHG9svy7G8hoTSPpltzhw= 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 deleted file mode 100644 index 105a7110..00000000 --- a/test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 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_cd49971e-bf4c-4594-8474-54ebef09a40c.xml b/test/ref/DCP/dcp_test1/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml new file mode 100644 index 00000000..c93f3d43 --- /dev/null +++ b/test/ref/DCP/dcp_test1/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml @@ -0,0 +1,31 @@ + + + urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c + 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 + ubRkmdOx95G/R77P6U8MSb/2XYE= + 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 + cb1OLhgHG9svy7G8hoTSPpltzhw= + 161326 + application/mxf + + + diff --git a/test/ref/DCP/dcp_test7/ASSETMAP b/test/ref/DCP/dcp_test7/ASSETMAP index 4a2bb306..b410f5ed 100644 --- a/test/ref/DCP/dcp_test7/ASSETMAP +++ b/test/ref/DCP/dcp_test7/ASSETMAP @@ -1,6 +1,6 @@ - urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09 + urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430 Created by libdcp 1 2012-07-17T04:45:18+00:00 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 + urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c true - pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml + pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml 1 0 1253 diff --git a/test/ref/DCP/dcp_test7/audio.mxf b/test/ref/DCP/dcp_test7/audio.mxf index 62158f3f..b58ff436 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_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml index 4cce722e..aa966ea6 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:8e293965-f8ad-48c6-971d-261b01f65cdb + urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 @@ -34,7 +34,7 @@ 24 0 24 - ifmC1P7fjigb1oVxx6xs3Paz/GY= + cb1OLhgHG9svy7G8hoTSPpltzhw= 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 deleted file mode 100644 index f526f380..00000000 --- a/test/ref/DCP/dcp_test7/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 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_cd49971e-bf4c-4594-8474-54ebef09a40c.xml b/test/ref/DCP/dcp_test7/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml new file mode 100644 index 00000000..7c980d47 --- /dev/null +++ b/test/ref/DCP/dcp_test7/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml @@ -0,0 +1,31 @@ + + + urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c + 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 + jI0HRE3Ncpe2bQnfFWOSvcgCkqk= + 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 + cb1OLhgHG9svy7G8hoTSPpltzhw= + 161326 + application/x-smpte-mxf;asdcpKind=Sound + + + -- cgit v1.2.3