MXF changes with newer version of asdcplib.

4 files changed, 12 insertions, 12 deletions

diff --git a/test/ref/DCP/encryption_test/audio.mxf b/test/ref/DCP/encryption_test/audio.mxf
index 843d95f4..eb38290f 100644
--- a/test/ref/DCP/encryption_test/audio.mxf
+++ b/test/ref/DCP/encryption_test/audio.mxf
diff --git a/test/ref/DCP/encryption_test/cpl_cdecf5ab-b688-4842-bd60-0c9f5ce56e8c.xml b/test/ref/DCP/encryption_test/cpl_cdecf5ab-b688-4842-bd60-0c9f5ce56e8c.xml
index bb25dccb..65d97712 100644
--- a/test/ref/DCP/encryption_test/cpl_cdecf5ab-b688-4842-bd60-0c9f5ce56e8c.xml
+++ b/test/ref/DCP/encryption_test/cpl_cdecf5ab-b688-4842-bd60-0c9f5ce56e8c.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><ContentTitleText>A Test DCP</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id><LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:6f02ec2d-2a2d-437d-9391-daa7301b6910</Id><AssetList><MainPicture><Id>urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:aa157ca6-e3e3-4b6c-a7b6-50f52fcafb7f</KeyId><Hash>+1yr4l8eQ8KoX76cKFH8/vKNoio=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:f020346e-84f4-4f1e-a3b7-f7aeb57696a4</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:938f5140-bb1c-46ce-9078-e099ebbf04bf</KeyId><Hash>+Bvro/qWIQ+SjmVwg5/tiSNZ8qM=</Hash></MainSound></AssetList></Reel></ReelList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName></dsig:X509Data></Signer><dsig:Signature><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><dsig:Reference URI=""><dsig:Transforms><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>AGdonnKZIRs2RqyD2zPKlXJmzOI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>yT2hjEv8frr4JxMKfM/+ZziLyB8H2PZcStrSOiY2qp0nkCo63Mx0AyPpOhBNlbxp
-oY/Dbda3tA0I6fapOEbiFv6zkq2W3Fq0cDqIhcitIKyYmEV6EFnJNf7OPTW2obcA
-Zwbewgc8gmDS3fyJ+LWlwYNwQxRwya5rAVoGRbVRFMxqIzTdL11H14SXl70flSn3
-kJZ0CTiR81AsY5NSlHH1WWgawFf0zrPk1XXlzOAi5dtqhwWyoD2B2HMY0He158un
-zz/gAzOhp7E4XaDTrF+zGt//BNq3zHjiLumFwJnP/I7kM8/My7ey/6GgUuJYZs+W
-IyW59xmldQmjxljL25Nh8w==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
+<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><ContentTitleText>A Test DCP</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id><LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:6f02ec2d-2a2d-437d-9391-daa7301b6910</Id><AssetList><MainPicture><Id>urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:aa157ca6-e3e3-4b6c-a7b6-50f52fcafb7f</KeyId><Hash>6GmtRqSsVYBfu7B2SrbGCKR4hWU=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:f020346e-84f4-4f1e-a3b7-f7aeb57696a4</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:938f5140-bb1c-46ce-9078-e099ebbf04bf</KeyId><Hash>zRWj7GrUxb6LmlRPSmxM9WkxjAc=</Hash></MainSound></AssetList></Reel></ReelList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName></dsig:X509Data></Signer><dsig:Signature><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><dsig:Reference URI=""><dsig:Transforms><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>yvfZQzHq6YNvSUsGnOqOR72ZfG4=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>ktaU+ICoLnWir/YFJS9jDgqh0IfcOUmG2qhCLrJ7vyy3fUiEpGzLAfaHy+KKaLIE
+ExfPVL/hFC0YT8D0V8mDHm9Lmr5aMP/if89xuMvvS3S60davgPVDEXaQ9X7XunA6
+kJLUW49Se4Hzl1l5uIxYCkSEwjkx/i5DXGHePlJhwjkDtSrLLC++vFJ5d1evbabn
+23caK2bv2dhT70uc4GcxerbSGip2E9yL6YW3uBpk8ILpDpn594NEQH9BVlBfbqTX
+eW8Jf8Lsborkef41eSgn0KU7hwQcpTW/ga9xpwnDdOx7SERQUpRMxr6smso2Wa8G
+GTzeFC2Jgjb5vOX41RhJSQ==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
 NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
 NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y
diff --git a/test/ref/DCP/encryption_test/pkl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml b/test/ref/DCP/encryption_test/pkl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml
index 43665904..907f33d0 100644
--- a/test/ref/DCP/encryption_test/pkl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml
+++ b/test/ref/DCP/encryption_test/pkl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:abf9d74a-c344-40a0-a929-21add8a3bd6e</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><AssetList><Asset><Id>urn:uuid:cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</Id><AnnotationText>cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</AnnotationText><Hash>iDCfDZKLWn8nGuzLoKFIa+yOMKw=</Hash><Size>8618</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</Id><AnnotationText>a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</AnnotationText><Hash>+1yr4l8eQ8KoX76cKFH8/vKNoio=</Hash><Size>28840</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:f020346e-84f4-4f1e-a3b7-f7aeb57696a4</Id><AnnotationText>f020346e-84f4-4f1e-a3b7-f7aeb57696a4</AnnotationText><Hash>+Bvro/qWIQ+SjmVwg5/tiSNZ8qM=</Hash><Size>164398</Size><Type>application/mxf</Type></Asset></AssetList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName></dsig:X509Data></Signer><dsig:Signature><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><dsig:Reference URI=""><dsig:Transforms><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>kuvKvrDyJn/GoN59j4jnFYrCXBI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>uSVdlWoP4urgUpuZQs8opGS24L3pancS8Avr0j0P4WVaD9cY2fz9mTaXwWRffKZA
-/Vkz0aMBdseLV3frMN2RXk6urlvW1dW1RoAGLbil5Uyn0jDvpg9WO5ozG9z/ulhx
-UPm7nGV9ZCNEUAwUJQxJePkbyfrX6uTimBJuqA7q3gXDFUvhdwnYR5+30OO0KBcl
-8TBD8EXYqCOBgnYOJje7krfhr0Ki7kTr5TofWYWe5RKg08cNz8mpBk51xbjDDkpm
-8CHeW1pbnh3NkiPyetT2TehUlf6mgjr4p/f0VRw7V7kYEdBWE9fxP754zmA0Nd/y
-vm9C69VBnnPNh9m6vIlO0w==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
+<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:abf9d74a-c344-40a0-a929-21add8a3bd6e</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><AssetList><Asset><Id>urn:uuid:cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</Id><AnnotationText>cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</AnnotationText><Hash>HaGaNeGgZkrdaJa++2Pu435cM+Q=</Hash><Size>8618</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</Id><AnnotationText>a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</AnnotationText><Hash>6GmtRqSsVYBfu7B2SrbGCKR4hWU=</Hash><Size>28840</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:f020346e-84f4-4f1e-a3b7-f7aeb57696a4</Id><AnnotationText>f020346e-84f4-4f1e-a3b7-f7aeb57696a4</AnnotationText><Hash>zRWj7GrUxb6LmlRPSmxM9WkxjAc=</Hash><Size>164398</Size><Type>application/mxf</Type></Asset></AssetList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName></dsig:X509Data></Signer><dsig:Signature><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><dsig:Reference URI=""><dsig:Transforms><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>YPV9ZfRyuPmjYb/pWSIroJQvAxg=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>GK0VmpWRAcKnMSr7xUVLKu+ra5HC7S1b5QzgjZRIpYfV5giWnVqNpi3j1pbFZRJX
+tjmlKCk2zTBkIrVdPQStHexx4zI9/7TMgd+UbClqoHmdMYN25BiEt6JJZxb0YjBy
+fXXa9VbeDt+BusP09fpHlooITsJO1R9UGVExa6c8l4b5ams2n/D7OAJ7IQ8d3mO5
+Fw9PRoPdF0mE8LWQkQx8Xs5GrQontJSyX7x5rMioktGJssx/6v06kpwRfYbrr1sJ
+vIYj7eJNlw5/19VF3c6Yrl2N/sLwimqgSRrELuI1ks0RBV32ypYPSwFHTuHJrpcq
+uWYzJwIAU1FN6rNhhtF/GA==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
 NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
 NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y
diff --git a/test/ref/DCP/encryption_test/video.mxf b/test/ref/DCP/encryption_test/video.mxf
index 2f275de3..7ecc834e 100644
--- a/test/ref/DCP/encryption_test/video.mxf
+++ b/test/ref/DCP/encryption_test/video.mxf