Merge pull request #25 from remia/fix/non-pod-variadic-warning

[asdcplib.git] / src / MDD.cpp

diff --git a/src/MDD.cpp b/src/MDD.cpp
index a779c327680143ed2ed3a8b69cb79ba5cebaf72e..06d0fde760eea6a748bd18b8f78b81caa4868232 100644 (file)
--- a/src/MDD.cpp
+++ b/src/MDD.cpp
@@ -1156,12 +1156,12 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
      {0}, false, "DBOXMotionCodeSecondaryStream" },
 
    //  379-2, Sec. 7: Encoders that conform to this specification shall add a
-   // ContainerConstraintSubDescriptor to the GenericDescriptor::SubDescriptors
+   // ContainerConstraintsSubDescriptor to the GenericDescriptor::SubDescriptors
    // property of the top-most File Descriptor that describes the essence
    // container.
    { { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x01, // 373
        0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x67, 0x00 },
-     {0}, false, "ContainerConstraintSubDescriptor" },
+     {0}, false, "ContainerConstraintsSubDescriptor" },
 
    // protype for high dynamic range, values recorded in Dolby registry
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x05, // 374
@@ -1261,7 +1261,7 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 404
        0x04, 0x01, 0x01, 0x01, 0x03, 0x06, 0x00, 0x00 },
      {0}, false, "ColorPrimaries_P3D65" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0e, // 405
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 405
        0x04, 0x01, 0x01, 0x01, 0x03, 0x07, 0x00, 0x00 },
      {0}, false, "ColorPrimaries_ACES" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 406
@@ -1537,14 +1537,14 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
    { { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x05, // 494
        0x0e, 0x09, 0x05, 0x02, 0x00, 0x00, 0x00, 0x00 },
      {0}, false, "ISXDDataEssenceDescriptor" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x05, // 495
-       0x0e, 0x09, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00 },
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x05, // 495
+       0x0e, 0x09, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00 },
      {0}, false, "ISXDDataEssenceDescriptor_NamespaceURI" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x05, // 496
-       0x0e, 0x09, 0x06, 0x06, 0x00, 0x00, 0x00, 0xff },
+       0x0e, 0x09, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00 },
      {0}, false, "UTF_8_Text_DataEssenceCoding" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x01, // 497-chk
-       0x0D, 0x01, 0x04, 0x01, 0x04, 0x01, 0x01, 0x00 },
+       0x0d, 0x01, 0x04, 0x01, 0x04, 0x01, 0x01, 0x00 },
      {0}, false, "TextBasedDMFramework" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0D, // 498-chk
        0x06, 0x01, 0x01, 0x04, 0x05, 0x41, 0x01, 0x00 },
@@ -1594,18 +1594,42 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0e, // 513
        0x04, 0x01, 0x01, 0x01, 0x03, 0x08, 0x00, 0x00 },
      {0}, false, "ColorPrimaries_CinemaMezzanine" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 504
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 514
        0x0d, 0x01, 0x03, 0x01, 0x02, 0x19, 0x01, 0x00,  },
      {0}, false, "MXFGCFrameWrappedACESPictures" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 505
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 515
        0x04, 0x01, 0x02, 0x02, 0x03, 0x04, 0x01, 0x00,  },
      {0}, false, "ACESUncompressedMonoscopicWithoutAlpha" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 506
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 516
        0x04, 0x01, 0x02, 0x02, 0x03, 0x04, 0x02, 0x00,  },
      {0}, false, "ACESUncompressedMonoscopicWithAlpha" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x02, 0x01, 0x01, // 508
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x02, 0x01, 0x01, // 517
        0x0d, 0x01, 0x03, 0x01, 0x15, 0x01, 0x12, 0x00 },
      {0}, false, "ACESFrameWrappedEssence" },
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 518
+       0x03, 0x02, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00 },
+     {0}, false, "DCAudioChannel_FSKSyncSignalChannel" },
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e,
+       0x04, 0x01, 0x06, 0x03, 0x0f, 0x00, 0x00, 0x00 },
+     {0}, false, "JPEG2000PictureSubDescriptor_J2KExtendedCapabilities" }, // 519
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e,
+       0x04, 0x01, 0x06, 0x03, 0x10, 0x00, 0x00, 0x00 },
+     {0}, false, "JPEG2000PictureSubDescriptor_J2KProfile" }, // 520
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e,
+       0x04, 0x01, 0x06, 0x03, 0x11, 0x00, 0x00, 0x00 },
+     {0}, false, "JPEG2000PictureSubDescriptor_J2KCorrespondingProfile" }, // 521
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x04, 0x01, 0x01,
+       0x03, 0x01, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00 },
+     {0}, false, "J2KExtendedCapabilities" }, // 522
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0D,
+       0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x08, 0x00 },
+     {0}, false, "HTJ2KPictureCodingScheme" }, // 523
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0D,
+       0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x08, 0x01 },
+     {0}, false, "HTJ2KPictureCodingSchemeGeneric" }, // 524
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 525
+       0x0d, 0x0f, 0x03, 0x02, 0x01, 0x01, 0x00, 0x00 },
+     {0}, false, "AudioChannelSLVS" },
    { {0}, {0}, false, 0 },
 
 };