diff --git a/src/test/java/com/netflix/imflibrary/st0377/HeaderPartitionTest.java b/src/test/java/com/netflix/imflibrary/st0377/HeaderPartitionTest.java index fd40f9ac..3287cbed 100644 --- a/src/test/java/com/netflix/imflibrary/st0377/HeaderPartitionTest.java +++ b/src/test/java/com/netflix/imflibrary/st0377/HeaderPartitionTest.java @@ -221,7 +221,7 @@ public void videoHeaderPartitionTest2() throws IOException @Test public void videoHeaderPartitionTest3() throws IOException { - File inputFile = TestHelper.findResourceByPath("TestIMP/HT/IMP/VIDEO_c840cf14-d4c1-4960-82d8-e8fac0553ed4.mxf"); + File inputFile = TestHelper.findResourceByPath("TestIMP/HT/IMP/VIDEO_6ed567b7-c030-46d6-9c1c-0f09bab4b962.mxf"); IMFErrorLogger imfErrorLogger = new IMFErrorLoggerImpl(); HeaderPartition headerPartition = HeaderPartition.fromFile(inputFile, imfErrorLogger); Assert.assertTrue(headerPartition.toString().length() > 0); diff --git a/src/test/resources/TestIMP/HT/IMP/ASSETMAP.xml b/src/test/resources/TestIMP/HT/IMP/ASSETMAP.xml index c086c8f5..535768ab 100644 --- a/src/test/resources/TestIMP/HT/IMP/ASSETMAP.xml +++ b/src/test/resources/TestIMP/HT/IMP/ASSETMAP.xml @@ -1,28 +1,28 @@ - urn:uuid:ed9ebdd9-ba03-49de-a88e-489ba3debf94 - Meridian + urn:uuid:49e02e84-fee5-430a-8f0d-0063ff9f0e46 + Untitled Project Blackmagic Design DaVinci Resolve 19.0.0b.0050 1 - 2024-07-24T16:54:58 + 2024-09-30T13:25:04 Blackmagic Design - urn:uuid:c840cf14-d4c1-4960-82d8-e8fac0553ed4 + urn:uuid:6ed567b7-c030-46d6-9c1c-0f09bab4b962 - VIDEO_c840cf14-d4c1-4960-82d8-e8fac0553ed4.mxf + VIDEO_6ed567b7-c030-46d6-9c1c-0f09bab4b962.mxf 1 0 - 55071899 + 3651582 - urn:uuid:eb5765cc-b76b-47c7-bdf3-fc1a7c3d3817 + urn:uuid:b285d8f3-0294-4207-8ea8-4f0b72314213 - AUDIO_eb5765cc-b76b-47c7-bdf3-fc1a7c3d3817.mxf + AUDIO_b285d8f3-0294-4207-8ea8-4f0b72314213.mxf 1 0 651208 @@ -30,25 +30,25 @@ - urn:uuid:d96ab03f-9c0b-49a1-ae8a-00e96710dad8 + urn:uuid:67be5fc8-87f1-4172-8d52-819ca14c7a20 - CPL_d96ab03f-9c0b-49a1-ae8a-00e96710dad8.xml + CPL_67be5fc8-87f1-4172-8d52-819ca14c7a20.xml 1 0 - 13250 + 13275 - urn:uuid:40aeb8ba-60d3-4f79-b5b1-329f81d51689 + urn:uuid:52f61ec0-1517-49b7-a8e2-941c0200c69a true - PKL_40aeb8ba-60d3-4f79-b5b1-329f81d51689.xml + PKL_52f61ec0-1517-49b7-a8e2-941c0200c69a.xml 1 0 - 1693 + 1708 diff --git a/src/test/resources/TestIMP/HT/IMP/AUDIO_eb5765cc-b76b-47c7-bdf3-fc1a7c3d3817.mxf b/src/test/resources/TestIMP/HT/IMP/AUDIO_b285d8f3-0294-4207-8ea8-4f0b72314213.mxf similarity index 99% rename from src/test/resources/TestIMP/HT/IMP/AUDIO_eb5765cc-b76b-47c7-bdf3-fc1a7c3d3817.mxf rename to src/test/resources/TestIMP/HT/IMP/AUDIO_b285d8f3-0294-4207-8ea8-4f0b72314213.mxf index 655d1301..909d96d8 100644 Binary files a/src/test/resources/TestIMP/HT/IMP/AUDIO_eb5765cc-b76b-47c7-bdf3-fc1a7c3d3817.mxf and b/src/test/resources/TestIMP/HT/IMP/AUDIO_b285d8f3-0294-4207-8ea8-4f0b72314213.mxf differ diff --git a/src/test/resources/TestIMP/HT/IMP/CPL_d96ab03f-9c0b-49a1-ae8a-00e96710dad8.xml b/src/test/resources/TestIMP/HT/IMP/CPL_67be5fc8-87f1-4172-8d52-819ca14c7a20.xml similarity index 78% rename from src/test/resources/TestIMP/HT/IMP/CPL_d96ab03f-9c0b-49a1-ae8a-00e96710dad8.xml rename to src/test/resources/TestIMP/HT/IMP/CPL_67be5fc8-87f1-4172-8d52-819ca14c7a20.xml index 7210abe9..f2896773 100644 --- a/src/test/resources/TestIMP/HT/IMP/CPL_d96ab03f-9c0b-49a1-ae8a-00e96710dad8.xml +++ b/src/test/resources/TestIMP/HT/IMP/CPL_67be5fc8-87f1-4172-8d52-819ca14c7a20.xml @@ -1,22 +1,22 @@ - - urn:uuid:d96ab03f-9c0b-49a1-ae8a-00e96710dad8 - Meridian - 2024-07-24T16:54:58 + + urn:uuid:67be5fc8-87f1-4172-8d52-819ca14c7a20 + Untitled Project + 2024-09-30T13:25:04 Blackmagic Design Blackmagic Design DaVinci Resolve 19.0.0b.0050 Blackmagic Design - Meridian + Untitled Project advertisement - urn:uuid:367bbb62-2cee-4535-8a3c-04ad91e26a0e - Meridian 2024-07-24T16:54:58 + urn:uuid:8753678f-3a6f-4280-b8cd-32e62c6dc52e + Untitled Project 2024-09-30T13:25:04 - urn:uuid:be034cf8-75ab-4b7c-aedc-800b9b99b1ad + urn:uuid:8f05bbd7-6528-493d-a521-061a866bb35f @@ -56,7 +56,7 @@ 4095 ScanningDirection_LeftToRightTopToBottom 2 - urn:uuid:0b005d58-fe0d-42c6-a9d5-6b131413d69d + urn:uuid:aa5c9055-930b-4310-bf7c-492e59f8b13b 42 0 @@ -83,7 +83,7 @@ 80 - urn:uuid:ccf64724-2c99-479c-9cbb-8a796fefa8d9 + urn:uuid:ced40dbb-9754-4e58-8182-e540b553689e 16384 1920 1080 @@ -94,7 +94,7 @@ 0 0 3 - 01020001010503034000778888888888 + 01040001010503034000778888888888 22971e96ea96ea96bc8f008f008ee2874c874c876470037003704577d277d27761 131072 @@ -158,10 +158,10 @@ - urn:uuid:c9f4927b-0e97-4c74-9b40-47127798315b + urn:uuid:9ba0f02b-24aa-4ba8-b2e5-72fbc15ca960 2 - urn:uuid:97bc227c-3186-419c-8799-4f07a6b03703 + urn:uuid:771842d2-2530-4472-b777-97cfb2dc5211 48000/1 48000/1 2 @@ -176,8 +176,8 @@ 64064 - urn:uuid:f0a7cdac-f937-47a8-9de6-c79d91bda510 - urn:uuid:ced75cb8-b74d-4aff-b86f-70de29bb6783 + urn:uuid:c3f05ca0-9c39-4355-af1d-de4d82a5dce9 + urn:uuid:0524bd7c-c9a0-4b94-9b37-974a543edbf1 urn:smpte:ul:060e2b34.0401010d.03020220.01000000 Standard Stereo sgST @@ -188,18 +188,18 @@ en - urn:uuid:bbb94356-110b-4be0-8be8-8478881113a5 - urn:uuid:ced75cb8-b74d-4aff-b86f-70de29bb6783 - urn:uuid:9fa1d82d-ab89-4001-83bb-51c47595dae3 + urn:uuid:8fa0690e-af0a-4644-aee3-2a852d372e11 + urn:uuid:0524bd7c-c9a0-4b94-9b37-974a543edbf1 + urn:uuid:20c58809-8c39-4da1-b7d0-e7c284f0245f urn:smpte:ul:060e2b34.0401010d.03020101.00000000 Left chL 1 - urn:uuid:72670bf5-0cfe-48d2-b30c-baf10cd362ba - urn:uuid:ced75cb8-b74d-4aff-b86f-70de29bb6783 - urn:uuid:dd0b2e9e-f8df-4433-a294-a9f956011af5 + urn:uuid:b35affb0-7229-4e24-afb7-94f8b4e78f92 + urn:uuid:0524bd7c-c9a0-4b94-9b37-974a543edbf1 + urn:uuid:a410eaa1-1c04-46d2-8e00-79d6be465808 urn:smpte:ul:060e2b34.0401010d.03020102.00000000 Right chR @@ -210,9 +210,9 @@ - true + false 60 - 01:00:00;00 + 00:00:00:00 60000 1001 @@ -222,40 +222,40 @@ - urn:uuid:95b17e48-9b12-4328-832a-ff3938e01742 + urn:uuid:c91d1e5f-0b02-4085-b237-eacb019caa32 - urn:uuid:686ebd75-f5c4-44ca-a167-03020d104151 - urn:uuid:144ea2a4-ed33-4e86-8878-2872acab0b2d + urn:uuid:23bfe257-1452-4787-8d46-941b578929a1 + urn:uuid:0f241da9-8182-40c5-b29f-b5761cf9bd7e - urn:uuid:5bc113ad-9140-454b-8f96-0e888403d1ce - VIDEO_c840cf14-d4c1-4960-82d8-e8fac0553ed4.mxf + urn:uuid:4532a6e6-1e34-48fa-8f9a-aa12d48a2b2a + VIDEO_6ed567b7-c030-46d6-9c1c-0f09bab4b962.mxf 60000 1001 80 0 80 - urn:uuid:be034cf8-75ab-4b7c-aedc-800b9b99b1ad - urn:uuid:c840cf14-d4c1-4960-82d8-e8fac0553ed4 - L1Ofug8R6uipG8gkbqYrELs6w7c= + urn:uuid:8f05bbd7-6528-493d-a521-061a866bb35f + urn:uuid:6ed567b7-c030-46d6-9c1c-0f09bab4b962 + cpQ/yEUY5vdyL3mNdTH7xfB+cdg= - urn:uuid:5b32a98f-49ca-4ccd-8c1e-7a73caeb49dd - urn:uuid:7af9b966-c319-4569-921a-981bf3e9af9b + urn:uuid:ead0fcb6-4dc8-447f-900b-c5896ec74b4d + urn:uuid:ad38a4e8-838e-4a6d-84e1-9c69edeb615e - urn:uuid:7be237f4-3a0d-4189-96fb-c86212967104 - AUDIO_eb5765cc-b76b-47c7-bdf3-fc1a7c3d3817.mxf + urn:uuid:67519d5e-ed30-4919-96ee-2312f4c49c8a + AUDIO_b285d8f3-0294-4207-8ea8-4f0b72314213.mxf 48000 1 64064 0 64064 - urn:uuid:c9f4927b-0e97-4c74-9b40-47127798315b - urn:uuid:eb5765cc-b76b-47c7-bdf3-fc1a7c3d3817 - 4lh3WweP6n7fZpYG8LkR5lJ/BVM= + urn:uuid:9ba0f02b-24aa-4ba8-b2e5-72fbc15ca960 + urn:uuid:b285d8f3-0294-4207-8ea8-4f0b72314213 + il72nfYnuQCE1eykxSAmJxHvkwg= diff --git a/src/test/resources/TestIMP/HT/IMP/PKL_40aeb8ba-60d3-4f79-b5b1-329f81d51689.xml b/src/test/resources/TestIMP/HT/IMP/PKL_40aeb8ba-60d3-4f79-b5b1-329f81d51689.xml deleted file mode 100644 index ef3c0bc7..00000000 --- a/src/test/resources/TestIMP/HT/IMP/PKL_40aeb8ba-60d3-4f79-b5b1-329f81d51689.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - urn:uuid:40aeb8ba-60d3-4f79-b5b1-329f81d51689 - Meridian - 2024-07-24T16:54:58 - Blackmagic Design - Blackmagic Design DaVinci Resolve 19.0.0b.0050 - - - urn:uuid:c840cf14-d4c1-4960-82d8-e8fac0553ed4 - VIDEO_c840cf14-d4c1-4960-82d8-e8fac0553ed4.mxf - L1Ofug8R6uipG8gkbqYrELs6w7c= - 55071899 - application/mxf - VIDEO_c840cf14-d4c1-4960-82d8-e8fac0553ed4.mxf - - - - urn:uuid:eb5765cc-b76b-47c7-bdf3-fc1a7c3d3817 - AUDIO_eb5765cc-b76b-47c7-bdf3-fc1a7c3d3817.mxf - 4lh3WweP6n7fZpYG8LkR5lJ/BVM= - 651208 - application/mxf - AUDIO_eb5765cc-b76b-47c7-bdf3-fc1a7c3d3817.mxf - - - - urn:uuid:d96ab03f-9c0b-49a1-ae8a-00e96710dad8 - Meridian - JtWarQSySWGhy1v4B/oboG2PD40= - 13250 - text/xml - CPL_d96ab03f-9c0b-49a1-ae8a-00e96710dad8.xml - - - - diff --git a/src/test/resources/TestIMP/HT/IMP/PKL_52f61ec0-1517-49b7-a8e2-941c0200c69a.xml b/src/test/resources/TestIMP/HT/IMP/PKL_52f61ec0-1517-49b7-a8e2-941c0200c69a.xml new file mode 100644 index 00000000..49178a7b --- /dev/null +++ b/src/test/resources/TestIMP/HT/IMP/PKL_52f61ec0-1517-49b7-a8e2-941c0200c69a.xml @@ -0,0 +1,37 @@ + + + urn:uuid:52f61ec0-1517-49b7-a8e2-941c0200c69a + Untitled Project + 2024-09-30T13:25:04 + Blackmagic Design + Blackmagic Design DaVinci Resolve 19.0.0b.0050 + + + urn:uuid:6ed567b7-c030-46d6-9c1c-0f09bab4b962 + VIDEO_6ed567b7-c030-46d6-9c1c-0f09bab4b962.mxf + cpQ/yEUY5vdyL3mNdTH7xfB+cdg= + 3651582 + application/mxf + VIDEO_6ed567b7-c030-46d6-9c1c-0f09bab4b962.mxf + + + + urn:uuid:b285d8f3-0294-4207-8ea8-4f0b72314213 + AUDIO_b285d8f3-0294-4207-8ea8-4f0b72314213.mxf + il72nfYnuQCE1eykxSAmJxHvkwg= + 651208 + application/mxf + AUDIO_b285d8f3-0294-4207-8ea8-4f0b72314213.mxf + + + + urn:uuid:67be5fc8-87f1-4172-8d52-819ca14c7a20 + Untitled Project + CUwgGhQ0HX7TZXOkZKQeVl4Q4fc= + 13275 + text/xml + CPL_67be5fc8-87f1-4172-8d52-819ca14c7a20.xml + + + + diff --git a/src/test/resources/TestIMP/HT/IMP/VIDEO_6ed567b7-c030-46d6-9c1c-0f09bab4b962.mxf b/src/test/resources/TestIMP/HT/IMP/VIDEO_6ed567b7-c030-46d6-9c1c-0f09bab4b962.mxf new file mode 100644 index 00000000..988a0eb3 Binary files /dev/null and b/src/test/resources/TestIMP/HT/IMP/VIDEO_6ed567b7-c030-46d6-9c1c-0f09bab4b962.mxf differ diff --git a/src/test/resources/TestIMP/HT/IMP/VIDEO_c840cf14-d4c1-4960-82d8-e8fac0553ed4.mxf b/src/test/resources/TestIMP/HT/IMP/VIDEO_c840cf14-d4c1-4960-82d8-e8fac0553ed4.mxf deleted file mode 100644 index ec9a3ee5..00000000 Binary files a/src/test/resources/TestIMP/HT/IMP/VIDEO_c840cf14-d4c1-4960-82d8-e8fac0553ed4.mxf and /dev/null differ