Merge pull request #150 from Roy-Funderburk/feature-514

feature: Add 5.1.4 audio channel support, per SMPTE ST 377-42.

Author: jhursty

src/MDD.cpp

@@ -1800,6 +1800,23 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x02, 0x13 },
      {0, 0}, false, "JP2KEssenceCompression_IMFProfile_2K_Lossy_6_4" }, // 581
+
+   // 5.1.4 audio program from SMPTE ST 377-42
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x05,
+       0x0e, 0x09, 0x01, 0x01, 0x05, 0x02, 0x00, 0x00 },
+     {0, 0}, false, "DCAudioSoundfield_514" }, // 582
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x05,
+       0x0e, 0x09, 0x01, 0x01, 0x04, 0x03, 0x00, 0x00 },
+     {0, 0}, false, "DCAudioChannel_Ltfs" }, // 583
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x05,
+       0x0e, 0x09, 0x01, 0x01, 0x04, 0x04, 0x00, 0x00 },
+     {0, 0}, false, "DCAudioChannel_Rtfs" }, // 584
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x05,
+       0x0e, 0x09, 0x01, 0x01, 0x04, 0x07, 0x00, 0x00 },
+     {0, 0}, false, "DCAudioChannel_Ltrs" }, // 585
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x05,
+       0x0e, 0x09, 0x01, 0x01, 0x04, 0x08, 0x00, 0x00 },
+     {0, 0}, false, "DCAudioChannel_Ltrs" }, // 586
    { {0}, {0}, false, 0 },
 };
 

src/MDD.h

@@ -617,6 +617,11 @@ namespace ASDCP {
 	MDD_JP2KEssenceCompression_IMFProfile_2K_Lossy_6_2, // 579
 	MDD_JP2KEssenceCompression_IMFProfile_2K_Lossy_6_3, // 580
 	MDD_JP2KEssenceCompression_IMFProfile_2K_Lossy_6_4, // 581
+	MDD_DCAudioSoundfield_514, // 582
+	MDD_DCAudioChannel_Ltfs, // 583
+	MDD_DCAudioChannel_Rtfs, // 584
+	MDD_DCAudioChannel_Ltrs, // 585
+	MDD_DCAudioChannel_Rtrs, // 586
 	MDD_Max
     }; // enum MDD_t
 

src/MXF.cpp

@@ -1651,6 +1651,11 @@ ul_is_an_mca_group(const ASDCP::UL& ul)
       return true;
     }
 
+  if ( ul == ASDCP::DefaultSMPTEDict().ul(ASDCP::MDD_DCAudioSoundfield_514) ) // not all ULs obey ST 428-12
+    {
+      return true;
+    }
+
   return false;
 }
 
@@ -1934,6 +1939,11 @@ ASDCP::MXF::ASDCP_MCAConfigParser::ASDCP_MCAConfigParser(const Dictionary* d) :
   m_LabelMap.insert(pair("DBOX",  label_traits("D-BOX Motion Code Primary Stream"  , false, m_Dict->ul(MDD_DBOXMotionCodePrimaryStream))));
   m_LabelMap.insert(pair("DBOX2", label_traits("D-BOX Motion Code Secondary Stream", false, m_Dict->ul(MDD_DBOXMotionCodeSecondaryStream))));
   m_LabelMap.insert(pair("SLVS",  label_traits("Sign Language Video Stream"        , false, m_Dict->ul(MDD_AudioChannelSLVS))));
+  m_LabelMap.insert(pair("514",   label_traits("5.1.4"                             , true,  m_Dict->ul(MDD_DCAudioSoundfield_514))));
+  m_LabelMap.insert(pair("Ltfs",  label_traits("Left Top Front Surround"           , true,  m_Dict->ul(MDD_DCAudioChannel_Ltfs))));
+  m_LabelMap.insert(pair("Rtfs",  label_traits("Right Top Front Surround"          , true,  m_Dict->ul(MDD_DCAudioChannel_Rtfs))));
+  m_LabelMap.insert(pair("Ltrs",  label_traits("Left Top Rear Surround"            , true,  m_Dict->ul(MDD_DCAudioChannel_Ltrs))));
+  m_LabelMap.insert(pair("Rtrs",  label_traits("Right Top Rear Surround"           , true,  m_Dict->ul(MDD_DCAudioChannel_Rtrs))));
 }
 
 //