ReadFileIntoString() modified to return OK when the file is empty

[asdcplib.git] / src / MDD.cpp

diff --git a/src/MDD.cpp b/src/MDD.cpp
index bae0f2b5e25074d59676dde062d1a0315160460d..c8de0040752cb8e0f40de5ca1c364f62271be153 100644 (file)
--- a/src/MDD.cpp
+++ b/src/MDD.cpp
@@ -643,7 +643,7 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
      {0x3d, 0x03}, false, "GenericSoundEssenceDescriptor_AudioSamplingRate" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x04, // 202
        0x04, 0x02, 0x03, 0x01, 0x04, 0x00, 0x00, 0x00 },
-     {0x3d, 0x02}, false, "GenericSoundEssenceDescriptor_Locked" },
+     {0x3d, 0x02}, true, "GenericSoundEssenceDescriptor_Locked" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x01, // 203
        0x04, 0x02, 0x01, 0x01, 0x03, 0x00, 0x00, 0x00 },
      {0x3d, 0x04}, true, "GenericSoundEssenceDescriptor_AudioRefLevel" },
@@ -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_SoundEssenceCoding" },
+     {0x3d, 0x06}, true, "GenericSoundEssenceDescriptor_SoundEssenceCoding" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x01, // 209
        0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x43, 0x00 },
      {0}, false, "GenericDataEssenceDescriptor" },
@@ -719,9 +719,9 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
    { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x05, // 227
        0x04, 0x02, 0x03, 0x03, 0x05, 0x00, 0x00, 0x00 },
      {0x3d, 0x09}, false, "WaveAudioDescriptor_AvgBps" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x05, // 228
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x08, // 228
        0x04, 0x02, 0x03, 0x01, 0x0e, 0x00, 0x00, 0x00 },
-     {0x3d, 0x0e}, true, "WaveAudioDescriptor_PeakEnvelope" },
+     {0x3d, 0x0e}, true, "WaveAudioDescriptor_PeakEnvelopeData" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x01, // 229
        0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x5a, 0x00 },
      {0}, false, "JPEG2000PictureSubDescriptor" },
@@ -1117,10 +1117,10 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
      {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" },
+     {0}, false, "GenericSoundEssenceDescriptor_ReferenceImageEditRate" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 361
        0x04, 0x02, 0x01, 0x01, 0x07, 0x00, 0x00, 0x00 },
-     {0}, false, "WaveAudioDescriptor_ReferenceAudioAlignmentLevel" },
+     {0}, false, "GenericSoundEssenceDescriptor_ReferenceAudioAlignmentLevel" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 362
        0x04, 0x01, 0x03, 0x02, 0x0b, 0x00, 0x00, 0x00 },
      {0}, false, "GenericPictureEssenceDescriptor_AlternativeCenterCuts" },
@@ -1230,19 +1230,19 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
      {0}, false, "MXFGCP1FrameWrappedPictureElement" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x01, // 394
        0x04, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x00 },
-     {0}, false, "TransferCharacteristics_709" },
+     {0}, false, "TransferCharacteristic_ITU709" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0e, // 395
        0x04, 0x01, 0x01, 0x01, 0x01, 0x09, 0x00, 0x00 },
-     {0}, false, "TransferCharacteristics_2020" },
+     {0}, false, "TransferCharacteristic_ITU2020" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 396
        0x04, 0x01, 0x01, 0x01, 0x01, 0x08, 0x00, 0x00 },
-     {0}, false, "TransferCharacteristics_xvYCC" },
+     {0}, false, "TransferCharacteristic_IEC6196624_xvYCC" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 397
        0x04, 0x01, 0x01, 0x01, 0x01, 0x0a, 0x00, 0x00 },
-     {0}, false, "TransferCharacteristics_St2084" },
+     {0}, false, "TransferCharacteristic_SMPTEST2084" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x06, // 398
        0x04, 0x01, 0x01, 0x01, 0x01, 0x06, 0x00, 0x00 },
-     {0}, false, "TransferCharacteristics_linear" },
+     {0}, false, "TransferCharacteristic_linear" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x01, // 399
        0x04, 0x01, 0x01, 0x01, 0x02, 0x01, 0x00, 0x00 },
      {0}, false, "CodingEquations_601" },
@@ -1254,16 +1254,16 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
      {0}, false, "CodingEquations_Rec2020" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x06, // 402
        0x04, 0x01, 0x01, 0x01, 0x03, 0x03, 0x00, 0x00 },
-     {0}, false, "ColorPrimaries_BT709" },
+     {0}, false, "ColorPrimaries_ITU709" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0D, // 403
        0x04, 0x01, 0x01, 0x01, 0x03, 0x04, 0x00, 0x00 },
-     {0}, false, "ColorPrimaries_BT2020" },
+     {0}, false, "ColorPrimaries_ITU2020" },
    { { 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_XYZ" },
+     {0}, false, "ColorPrimaries_ACES" },
    { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 406
        0x04, 0x20, 0x04, 0x01, 0x01, 0x01, 0x00, 0x00 },
      {0}, false, "GenericPictureEssenceDescriptor_MasteringDisplayPrimaries" },
@@ -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 },
@@ -1588,8 +1588,30 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0c, // 511
        0x0d, 0x01, 0x04, 0x01, 0x04, 0x01, 0x01, 0x00 },
      {0}, false, "MXFTextBasedFramework" },
-   { {0}, {0}, false, 0 }
- };
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0e, // 512
+       0x04, 0x01, 0x01, 0x01, 0x03, 0x05, 0x00, 0x00 },
+     {0}, false, "ColorPrimaries_SMPTE_DCDM" },
+   { { 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, // 514
+       0x0d, 0x01, 0x03, 0x01, 0x02, 0x19, 0x01, 0x00,  },
+     {0}, false, "MXFGCFrameWrappedACESPictures" },
+   { { 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, // 516
+       0x04, 0x01, 0x02, 0x02, 0x03, 0x04, 0x02, 0x00,  },
+     {0}, false, "ACESUncompressedMonoscopicWithAlpha" },
+   { { 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" },   
+   { {0}, {0}, false, 0 },
+
+};
 
 //
 // end MDD.cpp