new macros to account for docstrings in data descriptors

[asdcplib.git] / src / MDD.cpp

diff --git a/src/MDD.cpp b/src/MDD.cpp
index eba638f28fb13cdfc7000be9aad18143d65b3140..fa88016084fbc775aeebc8177031e0b735350762 100644 (file)
--- a/src/MDD.cpp
+++ b/src/MDD.cpp
@@ -559,7 +559,7 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
       {0x32, 0x0f}, true, "GenericPictureEssenceDescriptor_AlphaTransparency" },
   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x02, // 174
       0x04, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x00 },
-      {0x32, 0x10}, true, "GenericPictureEssenceDescriptor_Gamma" },
+      {0x32, 0x10}, true, "GenericPictureEssenceDescriptor_TransferCharacteristic" },
   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x02, // 175
       0x04, 0x18, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00 },
       {0x32, 0x11}, true, "GenericPictureEssenceDescriptor_ImageAlignmentOffset" },
@@ -661,7 +661,7 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
       {0x3d, 0x0c}, true, "GenericSoundEssenceDescriptor_DialNorm" },
   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x02, // 208
       0x04, 0x02, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00 },
-      {0x3d, 0x06}, false, "GenericSoundEssenceDescriptor_SoundEssenceCompression" },
+      {0x3d, 0x06}, false, "GenericSoundEssenceDescriptor_SoundEssenceCoding" },
   { { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x01, // 209
       0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x43, 0x00 },
       {0}, false, "GenericDataEssenceDescriptor" },
@@ -1085,6 +1085,66 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 349
       0x03, 0x02, 0x03, 0x20, 0x03, 0x00, 0x00, 0x00 },
       {0}, false, "IMFAudioGroup_Dcm" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0c, // 350
+      0x06, 0x01, 0x01, 0x04, 0x02, 0x0f, 0x00, 0x00 },
+      {0}, false, "MaterialPackage_PackageMarker" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x02, // 351
+      0x04, 0x01, 0x02, 0x01, 0x01, 0x03, 0x01, 0x00 },
+      {0}, false, "GenericPictureEssenceDescriptor_CodingEquations" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x02, // 352
+      0x04, 0x01, 0x02, 0x01, 0x01, 0x06, 0x01, 0x00 },
+      {0}, false, "GenericPictureEssenceDescriptor_ColorPrimaries" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 353
+      0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x01, 0x11 },
+      {0}, false, "JP2KEssenceCompression_BroadcastProfile_1" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 354
+      0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x01, 0x12 },
+      {0}, false, "JP2KEssenceCompression_BroadcastProfile_2" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 355
+      0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x01, 0x13 },
+      {0}, false, "JP2KEssenceCompression_BroadcastProfile_3" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 356
+      0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x01, 0x14 },
+      {0}, false, "JP2KEssenceCompression_BroadcastProfile_4" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 357
+      0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x01, 0x15 },
+      {0}, false, "JP2KEssenceCompression_BroadcastProfile_5" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 358
+      0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x01, 0x16 },
+      {0}, false, "JP2KEssenceCompression_BroadcastProfile_6" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 359
+      0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x01, 0x17 },
+      {0}, false, "JP2KEssenceCompression_BroadcastProfile_7" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 360
+      0x04, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00, 0x00 },
+      {0}, false, "WaveAudioDescriptor_ReferenceImageEditRate" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 361
+      0x04, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00, 0x00 },
+      {0}, false, "WaveAudioDescriptor_ReferenceAudioAlignmentLevel" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 362
+      0x04, 0x01, 0x03, 0x02, 0x0b, 0x00, 0x00, 0x00 },
+      {0}, false, "GenericPictureEssenceDescriptor_AlternativeCenterCuts" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 363
+      0x04, 0x01, 0x05, 0x01, 0x13, 0x00, 0x00, 0x00 },
+      {0x32, 0x05}, true, "GenericPictureEssenceDescriptor_ActiveHeight" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 364
+      0x04, 0x01, 0x05, 0x01, 0x14, 0x00, 0x00, 0x00 },
+      {0x32, 0x04}, true, "GenericPictureEssenceDescriptor_ActiveWidth" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 365
+      0x04, 0x01, 0x05, 0x01, 0x15, 0x00, 0x00, 0x00 },
+      {0x32, 0x06}, true, "GenericPictureEssenceDescriptor_ActiveXOffset" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 366
+      0x04, 0x01, 0x05, 0x01, 0x16, 0x00, 0x00, 0x00 },
+      {0x32, 0x07}, true, "GenericPictureEssenceDescriptor_ActiveYOffset" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 367
+      0x03, 0x01, 0x01, 0x02, 0x02, 0x16, 0x00, 0x00 },
+      {0}, false, "TimedTextDescriptor_RFC5646LanguageTagList" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 368
+      0x04, 0x01, 0x01, 0x01, 0x00, 0x04, 0x01, 0x00 },
+      {0}, false, "AlternativeCenterCuts_4x3" },
+  { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 369
+      0x04, 0x01, 0x01, 0x01, 0x00, 0x04, 0x02, 0x00 },
+      {0}, false, "AlternativeCenterCuts_14x9" },
   { {0}, {0}, false, 0 }
 };