Update for changes to video MXF headers.
authorCarl Hetherington <cth@carlh.net>
Mon, 4 Feb 2019 12:47:10 +0000 (12:47 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 4 Feb 2019 12:47:10 +0000 (12:47 +0000)
15 files changed:
test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
test/ref/DCP/dcp_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml
test/ref/DCP/dcp_test1/video.mxf
test/ref/DCP/dcp_test2/cpl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml
test/ref/DCP/dcp_test2/pkl_9f19589a-01e5-4093-b23b-a32e143e5956.xml
test/ref/DCP/dcp_test2/video.mxf
test/ref/DCP/dcp_test5/cpl_3a8a01d1-0e1c-4ff0-977d-63d32995a1fd.xml
test/ref/DCP/dcp_test5/pkl_7574c611-f8de-4d20-98c4-2eb7dc87080a.xml
test/ref/DCP/dcp_test5/video.mxf
test/ref/DCP/dcp_test7/cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml
test/ref/DCP/dcp_test7/pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml
test/ref/DCP/dcp_test7/video.mxf
test/ref/DCP/encryption_test/cpl_b3eba4a0-f542-4937-b972-1cc4667ed01a.xml
test/ref/DCP/encryption_test/pkl_59730183-23bc-491e-906b-1dd453ff9d11.xml
test/ref/DCP/encryption_test/video.mxf

index 7ad9476cdf7a853283b08af901d6ac3728bffd88..7ab840240c2c26ff57a4702c413adc580d6c4428 100644 (file)
@@ -23,7 +23,7 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>slY21Qy2B4cj1HgPuypJh9SwpHI=</Hash>
+          <Hash>1uPB643nrQfpY+Y0AypGko+PiPE=</Hash>
           <FrameRate>24 1</FrameRate>
           <ScreenAspectRatio>32 32</ScreenAspectRatio>
         </MainPicture>
index 3c4bf08cc48ad5644fc5efaa7c0f016fcade50e4..48a6cb9c41cbc481af143041187214b8a9a24d48 100644 (file)
@@ -9,14 +9,14 @@
     <Asset>
       <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
       <AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
-      <Hash>RuAlMIS/G3ztF4AmoKIriNNZj3s=</Hash>
+      <Hash>Ak8hEl96TMfLaOWB6IAtoE3tK/g=</Hash>
       <Size>1664</Size>
       <Type>text/xml</Type>
     </Asset>
     <Asset>
       <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
       <AnnotationText>1fab8bb0-cfaf-4225-ad6d-01768bc10470</AnnotationText>
-      <Hash>slY21Qy2B4cj1HgPuypJh9SwpHI=</Hash>
+      <Hash>1uPB643nrQfpY+Y0AypGko+PiPE=</Hash>
       <Size>26080</Size>
       <Type>application/mxf</Type>
     </Asset>
index 45a07788e3eb736863485ca9b427de9882d80b6d..dde49093270bbb54d53833fb4e89bd5c87b879e1 100644 (file)
Binary files a/test/ref/DCP/dcp_test1/video.mxf and b/test/ref/DCP/dcp_test1/video.mxf differ
index b03c1d14cc52b498b919f42c5915a23bd500757d..ed1134ca2aaae76ab746b04652a575c1229a721e 100644 (file)
@@ -32,7 +32,7 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>z3sZzo6/x8MT82rmGWHd0bi87R0=</Hash>
+          <Hash>OEAL0t1jvySBWib02IdWNHkPWsA=</Hash>
           <FrameRate>48 1</FrameRate>
           <ScreenAspectRatio>32 32</ScreenAspectRatio>
         </msp-cpl:MainStereoscopicPicture>
index 840257c1985409fe1de08e27b022b7e0da7cfd05..900f71b0e04c33d0559b70c962311e665959aced 100644 (file)
@@ -9,14 +9,14 @@
     <Asset>
       <Id>urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d</Id>
       <AnnotationText>48db27c3-4964-46a2-8b02-3e5570efb42d</AnnotationText>
-      <Hash>BTqUBNe84wswAY7uHeuSQWK+0yw=</Hash>
+      <Hash>9paU+xC4xaYBvPJQPCyDIhzQIEY=</Hash>
       <Size>1788</Size>
       <Type>text/xml</Type>
     </Asset>
     <Asset>
       <Id>urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430</Id>
       <AnnotationText>63c3aece-c581-4603-b612-75e43f0c0430</AnnotationText>
-      <Hash>z3sZzo6/x8MT82rmGWHd0bi87R0=</Hash>
+      <Hash>OEAL0t1jvySBWib02IdWNHkPWsA=</Hash>
       <Size>35032</Size>
       <Type>application/mxf</Type>
     </Asset>
index 2e7309e58ec230617cbc67a73f6833c92fab7344..cd97d571994df90588156fac4f8e1cbc580427ee 100644 (file)
Binary files a/test/ref/DCP/dcp_test2/video.mxf and b/test/ref/DCP/dcp_test2/video.mxf differ
index 10c461d8fb9d0d2d3d9b5fcb65a9bda5cff40b00..be617be397a61bc5fbd9c36a34f70a02e61554aa 100644 (file)
@@ -23,7 +23,7 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>VTsekMDdlNcYFFyTQIQdmaxpwfM=</Hash>
+          <Hash>K4HdTpPPOuFkq9VsRXau8+uPA1A=</Hash>
           <FrameRate>24 1</FrameRate>
           <ScreenAspectRatio>32 32</ScreenAspectRatio>
         </MainPicture>
index 8e5055128176ecb3cf7c66d12c648decd4927eef..9f80589470f55122c8f6015394c6f460583da149 100644 (file)
@@ -9,14 +9,14 @@
     <Asset>
       <Id>urn:uuid:3a8a01d1-0e1c-4ff0-977d-63d32995a1fd</Id>
       <AnnotationText>3a8a01d1-0e1c-4ff0-977d-63d32995a1fd</AnnotationText>
-      <Hash>CRf+RPBXoJmN3aRUelk7NlZ13eM=</Hash>
+      <Hash>vjqb+OKDts+tVrOdl5VK1/7kDlU=</Hash>
       <Size>2213</Size>
       <Type>text/xml</Type>
     </Asset>
     <Asset>
       <Id>urn:uuid:2527dbe5-41f7-4a22-a2d2-bd7cfeffbce1</Id>
       <AnnotationText>2527dbe5-41f7-4a22-a2d2-bd7cfeffbce1</AnnotationText>
-      <Hash>VTsekMDdlNcYFFyTQIQdmaxpwfM=</Hash>
+      <Hash>K4HdTpPPOuFkq9VsRXau8+uPA1A=</Hash>
       <Size>26080</Size>
       <Type>application/mxf</Type>
     </Asset>
index 6db9c51ec7466db3b4f839f9c4d4dc1802ce187c..ff6900b79fb55d3cba6a126954d8ec8555c94c1d 100644 (file)
Binary files a/test/ref/DCP/dcp_test5/video.mxf and b/test/ref/DCP/dcp_test5/video.mxf differ
index a1154c26e2b7f3fb9ed86a0f1e6019faa1bfca5b..251846aa983ba94d330e5891e84dab539d82a65e 100644 (file)
@@ -23,7 +23,7 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>tdGCQpv8Yyz8FSafi+2UMEwbmW8=</Hash>
+          <Hash>OAQxUPOCyW+SkZkZ+GoSIhxkn8E=</Hash>
           <FrameRate>24 1</FrameRate>
           <ScreenAspectRatio>1.33</ScreenAspectRatio>
         </MainPicture>
index aa69b4cdd59e2f3c20098406be76a3c1b679938b..6294ecd4c64d781c85407994438c304ab23187dd 100644 (file)
@@ -9,14 +9,14 @@
     <Asset>
       <Id>urn:uuid:1d513f84-5856-4f91-a88a-4d452cc6a28a</Id>
       <AnnotationText>1d513f84-5856-4f91-a88a-4d452cc6a28a</AnnotationText>
-      <Hash>jgPbFh6HUuQMQ0eO5eoP2UKLm3s=</Hash>
+      <Hash>XNG8TzgVUkfGewkKVXqlTV7yODQ=</Hash>
       <Size>1666</Size>
       <Type>text/xml;asdcpKind=CPL</Type>
     </Asset>
     <Asset>
       <Id>urn:uuid:cb2b7aa9-a378-4392-86f8-df013863fdd0</Id>
       <AnnotationText>cb2b7aa9-a378-4392-86f8-df013863fdd0</AnnotationText>
-      <Hash>tdGCQpv8Yyz8FSafi+2UMEwbmW8=</Hash>
+      <Hash>OAQxUPOCyW+SkZkZ+GoSIhxkn8E=</Hash>
       <Size>26080</Size>
       <Type>application/x-smpte-mxf;asdcpKind=Picture</Type>
     </Asset>
index ee1d3646f69bcedb5ff6401ff4993791820b2e93..0a6b97971c09f531778e0083018de67b19c48ca5 100644 (file)
Binary files a/test/ref/DCP/dcp_test7/video.mxf and b/test/ref/DCP/dcp_test7/video.mxf differ
index 0bfa9ecc118b11e25f12fae91694e5f7f09b5ccd..d79d98c06f7de4217c865e47c9ba4498e503f228 100644 (file)
@@ -24,7 +24,7 @@
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
           <KeyId>urn:uuid:0b493509-3c79-4139-82c0-a330c1ab03f5</KeyId>
-          <Hash>K9qEC5Gd4ZDSe3+lGnPg7Wc9QnQ=</Hash>
+          <Hash>67diQ9tld/BCyMIzFM9yzBoIjKc=</Hash>
           <FrameRate>24 1</FrameRate>
           <ScreenAspectRatio>32 32</ScreenAspectRatio>
         </MainPicture>
           <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-        <dsig:DigestValue>nS+znU9kqnCyBS1T3cLDY6OX8+8=</dsig:DigestValue>
+        <dsig:DigestValue>lcdyVT8inONqxC5htOKbHp4CBo4=</dsig:DigestValue>
       </dsig:Reference>
     </dsig:SignedInfo>
-    <dsig:SignatureValue>xXM08sLu8RmzY6exjZ1H2P0bo9IrtplForpTxWXKujfV9U+n8g8NL+Uc5PcF1VQ1
-25uqCCVIX5Y+uWO/WXwSrK7gTv8jUcXZgujRTaHnmst6Kp1RE7df+vZqr3MRucrw
-oEKYmf2TmoOTcnzXxU/7SbBkhMdD4TK21BJGC3L3a8ZHmvVaFMq7BZE2tB6bhRj+
-eOsQA6ManyGBmIjBO/peuxG0Yy/r0u+xk2HrnAzhYKhTWy/zq1xxSjW4LpmpDrzF
-naQZBwm3dlX8ZMAI7dOw9LGkj2LLFeofm5e8pQ7g3yqKX06ht/Bv5JMKyqu1QFeZ
-rb0Pcip2Gf828mZanpCWqg==</dsig:SignatureValue>
+    <dsig:SignatureValue>Z37dh5UV8iRaCV9c6QWxjER1j6UQPeUSL+m7+vqrm13aVjwhk2eURcppFhvM/RZi
+ukY0mOPQkQ+lrTNYRfQEvCRV+waMW4k22ivXafkNGXZ1axFLhj/bAoGVhYmBIGr9
+dvXcYmdI0exBcDugmioN8ZghhaaslS9+V1ylduZrATCsr5GBdtLQw4nqappam5jM
+BaRq9DZBj29Oc/guMpTCgHJEqBJggTxc8Zp4YAm+BF4xwYOzG6cU/s/jjoSPWmnH
+bgHfIsUnTCV4nFdG5bUjc1FmGAcOIJ1wDRXKdAWZflAGsDYsCQU2jlv7nMzc7sUD
+KNjYGw449Tso4F8bkfJ+ug==</dsig:SignatureValue>
     <dsig:KeyInfo>
       <dsig:X509Data>
         <dsig:X509IssuerSerial>
index a7168ef32badcf1e43a24ffe6116bf70ee2ffebf..b0d78982effacbbad4d76efe31b36e55fe9ad5bf 100644 (file)
@@ -9,14 +9,14 @@
     <Asset>
       <Id>urn:uuid:b3eba4a0-f542-4937-b972-1cc4667ed01a</Id>
       <AnnotationText>b3eba4a0-f542-4937-b972-1cc4667ed01a</AnnotationText>
-      <Hash>tpUjR0kXbig8s2CocAWYClebhQ8=</Hash>
+      <Hash>CP1vGWWg0jTELvnvLkVmj/PSFxI=</Hash>
       <Size>9376</Size>
       <Type>text/xml</Type>
     </Asset>
     <Asset>
       <Id>urn:uuid:2d4e8308-7197-41b8-8a0a-07a939d74971</Id>
       <AnnotationText>2d4e8308-7197-41b8-8a0a-07a939d74971</AnnotationText>
-      <Hash>K9qEC5Gd4ZDSe3+lGnPg7Wc9QnQ=</Hash>
+      <Hash>67diQ9tld/BCyMIzFM9yzBoIjKc=</Hash>
       <Size>29896</Size>
       <Type>application/mxf</Type>
     </Asset>
           <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-        <dsig:DigestValue>Z7V1q5p+dQnsm0RpCUFh6IpuEqo=</dsig:DigestValue>
+        <dsig:DigestValue>VDVmBjODM/VDWbPZNjmhJf9jF3s=</dsig:DigestValue>
       </dsig:Reference>
     </dsig:SignedInfo>
-    <dsig:SignatureValue>0KCrTng/LtHmt0jGJmZbwjdijsF+P7vW4riIkSmt/Qsuo8JI3ZB3f2uuG2H5Xrgb
-gdfA+WB6CmSQzyia11gcRB/dc6C0fjkt+OqQF3BlVGpQLG7Mz/C+VsF4G8HBpjmU
-yFucBirohEyEEPffQXn7/sMA4jPCpW6ZBrLLFv/UtTje3jUXgGW7UdwN2QC/mO2P
-Tf4lavCNyV56moxm98PlYMJDeNSSY5fo9TP315LjycA4Y8ZYxFF965/K2dcD/B5p
-pmFwbW4HYiKzAHKfaj/UnohTllKiIK5QnGA1NjAxMPGvk/sTF6IIU5cxp6OOmdvI
-cO1bBzOAhcWerV2P+xz3Ag==</dsig:SignatureValue>
+    <dsig:SignatureValue>iYSJZxCK+OAlAoWjjzFQMO83VBQEdaIYWwdJsxwuBBVd0PRwJuDmR8ks5tq0K761
+M26zXD8O6xT2BOmTSEF1nBlElQoP23/wCnbFA44wYcSEpfZG0GuR+HzTNWlqigiq
+xNyNdOKfBBuYZ3s+u+EkxCZsYa/eo9jaPhqQxIJ2anspR5jmvoOY53IqcLuljS5F
+qmrV+JwlniSn/7MfGFsOCqD3kK8ssa7UM9K+hDtHQYQVAItYyfy/jbJDRUL3gV1B
+lsBHH3YSu2L7shdJFKROYJQYYQYtp/Dfk5VjbgUmJsTX+Kbw/FbweEzD3vxp8coy
+qLh+hVCRexNuXthspMtZtw==</dsig:SignatureValue>
     <dsig:KeyInfo>
       <dsig:X509Data>
         <dsig:X509IssuerSerial>
index 207ad7d47160fc66eb429b86ae2037b6d8fb7c68..9f9824cf9dc8639d89388d62d39bbd20539fd040 100644 (file)
Binary files a/test/ref/DCP/encryption_test/video.mxf and b/test/ref/DCP/encryption_test/video.mxf differ