Write MCA tags based on the specified sound field.

I had previously assumed that one should write MCA information into
the sound MXF based on what channels actually contain sound rather
than silence.

However a previous example of a stereo DCP gives a verification error
in EasyDCP (see DoM bug #1935) which is solved by adding MCA tags
for each channel in the specified sound field (e.g. at least 6 tags
for a file which is marked as 5.1) even if the audio is really stereo.

This commit removes the "active channels" stuff and makes sure
that if we say a file is 5.1 we write at least 6 MCA tags (and
similarly for 7.1).

4 files changed, 8 insertions, 8 deletions

diff --git a/test/ref/DCP/dcp_test2/ASSETMAP.xml b/test/ref/DCP/dcp_test2/ASSETMAP.xml
index 73d9d9a1..1940929e 100644
--- a/test/ref/DCP/dcp_test2/ASSETMAP.xml
+++ b/test/ref/DCP/dcp_test2/ASSETMAP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM">
-  <Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</Id>
+  <Id>urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f</Id>
   <AnnotationText>Created by libdcp</AnnotationText>
   <Creator>OpenDCP 0.0.25</Creator>
   <VolumeCount>1</VolumeCount>
@@ -8,11 +8,11 @@
   <Issuer>OpenDCP 0.0.25</Issuer>
   <AssetList>
     <Asset>
-      <Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id>
+      <Id>urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff</Id>
       <PackingList>true</PackingList>
       <ChunkList>
         <Chunk>
-          <Path>pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml</Path>
+          <Path>pkl_93182bd2-b1e8-41a3-b5c8-6e6564273bff.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1186</Length>
diff --git a/test/ref/DCP/dcp_test2/audio.mxf b/test/ref/DCP/dcp_test2/audio.mxf
index d249b939..668ab05a 100644
--- a/test/ref/DCP/dcp_test2/audio.mxf
+++ b/test/ref/DCP/dcp_test2/audio.mxf
diff --git a/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
index 26bc6caf..fa7ce229 100644
--- a/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
+++ b/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
@@ -14,7 +14,7 @@
   <RatingList/>
   <ReelList>
     <Reel>
-      <Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</Id>
+      <Id>urn:uuid:793170e7-e913-404b-8942-1c7f2e5cf012</Id>
       <AssetList>
         <MainSound>
           <Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id>
@@ -23,7 +23,7 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>fnl4pJDAQk/xQ54W4R+l6S7PB7E=</Hash>
+          <Hash>ZONON+FxuDpU4nLiPCOiT4c/6qM=</Hash>
         </MainSound>
         <msp-cpl:MainStereoscopicPicture xmlns:msp-cpl="http://www.smpte-ra.org/schemas/429-10/2008/Main-Stereo-Picture-CPL">
           <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
diff --git a/test/ref/DCP/dcp_test2/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml b/test/ref/DCP/dcp_test2/pkl_93182bd2-b1e8-41a3-b5c8-6e6564273bff.xml
index 29c9be0f..d7039a68 100644
--- a/test/ref/DCP/dcp_test2/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml
+++ b/test/ref/DCP/dcp_test2/pkl_93182bd2-b1e8-41a3-b5c8-6e6564273bff.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL">
-  <Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id>
+  <Id>urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff</Id>
   <AnnotationText>Created by libdcp</AnnotationText>
   <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
   <Issuer>OpenDCP 0.0.25</Issuer>
@@ -9,7 +9,7 @@
     <Asset>
       <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
       <AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
-      <Hash>kXKqQAWnzfzo230TdOZh4tZ+z6A=</Hash>
+      <Hash>S4F3eG0+QoiL/NMxwaS1KDxpico=</Hash>
       <Size>1774</Size>
       <Type>text/xml</Type>
     </Asset>
@@ -23,7 +23,7 @@
     <Asset>
       <Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id>
       <AnnotationText>8b92bcee-62fc-4a33-a51a-816e9611ce85</AnnotationText>
-      <Hash>fnl4pJDAQk/xQ54W4R+l6S7PB7E=</Hash>
+      <Hash>ZONON+FxuDpU4nLiPCOiT4c/6qM=</Hash>
       <Size>161326</Size>
       <Type>application/mxf</Type>
     </Asset>