Merge pull request #95 from msheby/bugfix/issue71

Bugfix/issue71

5 files changed, 21 insertions, 7 deletions

diff --git a/src/MDD.cpp b/src/MDD.cpp
index 4b3b928..4584a48 100644
--- a/src/MDD.cpp
+++ b/src/MDD.cpp
@@ -1069,7 +1069,7 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
      {0, 0}, false, "IMFAudioSoundfield_LtRt" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 344
        0x03, 0x02, 0x02, 0x20, 0x0a, 0x00, 0x00, 0x00 },
-     {0, 0}, false, "IMFAudioSoundfield_51Ex" },
+     {0, 0}, false, "IMFAudioSoundfield_51EX" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 345
        0x03, 0x02, 0x02, 0x20, 0x0b, 0x00, 0x00, 0x00 },
      {0, 0}, false, "IMFAudioSoundfield_HI" },
diff --git a/src/MDD.h b/src/MDD.h
index 730d74b..2250f0c 100755
--- a/src/MDD.h
+++ b/src/MDD.h
@@ -379,7 +379,7 @@ namespace ASDCP {
 	MDD_IMFAudioSoundfield_60, // 341
 	MDD_IMFAudioSoundfield_70, // 342
 	MDD_IMFAudioSoundfield_LtRt, // 343
-	MDD_IMFAudioSoundfield_51Ex, // 344
+	MDD_IMFAudioSoundfield_51EX, // 344
 	MDD_IMFAudioSoundfield_HI, // 345
 	MDD_IMFAudioSoundfield_VIN, // 346
 	MDD_IMFAudioGroup_MPg, // 347
diff --git a/src/MXF.cpp b/src/MXF.cpp
index 94c94ad..3566c70 100755
--- a/src/MXF.cpp
+++ b/src/MXF.cpp
@@ -1915,7 +1915,7 @@ ASDCP::MXF::AS02_MCAConfigParser::AS02_MCAConfigParser(const Dictionary* d) : AS
   m_LabelMap.insert(pair("60",    label_traits("6.0",  true,  m_Dict->ul(MDD_IMFAudioSoundfield_60))));
   m_LabelMap.insert(pair("70",    label_traits("7.0DS",  true,  m_Dict->ul(MDD_IMFAudioSoundfield_70))));
   m_LabelMap.insert(pair("LtRt",  label_traits("Lt-Rt",true,  m_Dict->ul(MDD_IMFAudioSoundfield_LtRt))));
-  m_LabelMap.insert(pair("51Ex",  label_traits("5.1EX",true,  m_Dict->ul(MDD_IMFAudioSoundfield_51Ex))));
+  m_LabelMap.insert(pair("51EX",  label_traits("5.1EX",true,  m_Dict->ul(MDD_IMFAudioSoundfield_51EX))));
   m_LabelMap.insert(pair("HA",    label_traits("Hearing Accessibility",  true,  m_Dict->ul(MDD_IMFAudioSoundfield_HI))));
   m_LabelMap.insert(pair("VA",   label_traits("Visual Accessibility", true,  m_Dict->ul(MDD_IMFAudioSoundfield_VIN))));
 
diff --git a/src/as-02-wrap-jxs.cpp b/src/as-02-wrap-jxs.cpp
index 3517fef..fa57460 100644
--- a/src/as-02-wrap-jxs.cpp
+++ b/src/as-02-wrap-jxs.cpp
@@ -139,7 +139,7 @@ Options:\n\
                       Defaults to 4,194,304 (4MB)\n\
   -c <num>          - Select the IMF color system to be signaled:\n\
                       Application 2 (2067-20): 1, 2, or 3\n\
-                      Application 2e (2067-21): 4 or 5\n\
+                      Application 2e (2067-21): 4, 5, or 7\n\
                       All color system values assume YCbCr; also use -R for RGB\n\
   -d <duration>     - Number of frames to process, default all\n\
   -D <depth>        - Component depth for YCbCr images (default: 10)\n\
@@ -410,8 +410,15 @@ public:
 	use_cdci_descriptor = true;
 	break;
 
+      case '7':
+	coding_equations = g_dict->ul(MDD_CodingEquations_Rec2020);
+	transfer_characteristic = g_dict->ul(MDD_TransferCharacteristic_SMPTEST2084);
+	color_primaries = g_dict->ul(MDD_ColorPrimaries_ITU2020);
+	use_cdci_descriptor = true;
+	break;
+
       default:
-	fprintf(stderr, "Unrecognized color system number, expecting one of 1-5.\n");
+	fprintf(stderr, "Unrecognized color system number, expecting one of 1-5 or 7.\n");
 	return false;
       }
     
diff --git a/src/as-02-wrap.cpp b/src/as-02-wrap.cpp
index 713bcdb..387d07d 100755
--- a/src/as-02-wrap.cpp
+++ b/src/as-02-wrap.cpp
@@ -139,7 +139,7 @@ Options:\n\
                       Defaults to 4,194,304 (4MB)\n\
   -c <num>          - Select the IMF color system to be signaled:\n\
                       Application 2 (2067-20): 1, 2, or 3\n\
-                      Application 2e (2067-21): 4 or 5\n\
+                      Application 2e (2067-21): 4, 5, or 7\n\
                       All color system values assume YCbCr; also use -R for RGB\n\
   -C <ul>           - Set ChannelAssignment UL value\n\
   -d <duration>     - Number of frames to process, default all\n\
@@ -459,8 +459,15 @@ public:
 	use_cdci_descriptor = true;
 	break;
 
+      case '7':
+	coding_equations = g_dict->ul(MDD_CodingEquations_Rec2020);
+	transfer_characteristic = g_dict->ul(MDD_TransferCharacteristic_SMPTEST2084);
+	color_primaries = g_dict->ul(MDD_ColorPrimaries_ITU2020);
+	use_cdci_descriptor = true;
+	break;
+
       default:
-	fprintf(stderr, "Unrecognized color system number, expecting one of 1-5.\n");
+	fprintf(stderr, "Unrecognized color system number, expecting one of 1-5 or 7.\n");
 	return false;
       }