Merge pull request #86 from thorfdbg/master

Added JPEG XS related metadata to the asdcplib.

2 files changed, 136 insertions, 1 deletions

diff --git a/src/MDD.cpp b/src/MDD.cpp
index 017a53c..4b3b928 100644
--- a/src/MDD.cpp
+++ b/src/MDD.cpp
@@ -1660,8 +1660,109 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
    { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x05, // 535
        0x0e, 0x09, 0x06, 0x04, 0x00, 0x00, 0x00, 0x00 },
      {0, 0}, false, "ImmersiveAudioCoding" },
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  
+       0x0d, 0x01, 0x03, 0x01, 0x02, 0x21, 0x00, 0x00 },
+     {0}, false, "MXFGCJPEGXSPictures" },              // 536
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,
+       0x0d, 0x01, 0x03, 0x01, 0x02, 0x21, 0x01, 0x00 },
+     {0}, false, "MXFGCFrameWrappedProgressiveJPEGXSPictures" }, // 537
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,
+       0x0d, 0x01, 0x03, 0x01, 0x02, 0x21, 0x02, 0x00 },
+     {0}, false, "MXFGCFrameWrappedInterlacedJPEGXSPictures" }, // 538
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,
+       0x0d, 0x01, 0x03, 0x01, 0x02, 0x21, 0x03, 0x00 },
+     {0}, false, "MXFGCClipWrappedJPEGXSPictures" }, // 539
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,
+       0x04, 0x01, 0x02, 0x02, 0x03, 0x08, 0x00, 0x00 },
+     {0}, false, "JPEGXSPictureCodingSchemes"}, // 540
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,
+       0x04, 0x01, 0x02, 0x02, 0x03, 0x08, 0x01, 0x00 },
+     {0}, false, "JPEGXSUnrestrictedCodestream"},      // 541
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,
+       0x04, 0x01, 0x02, 0x02, 0x03, 0x08, 0x02, 0x00 },
+     {0}, false, "JPEGXSMain422_10Profile" },          // 542
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,
+       0x04, 0x01, 0x02, 0x02, 0x03, 0x08, 0x03, 0x00 },
+     {0}, false, "JPEGXSMain444_12Profile" },          // 543
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,
+       0x04, 0x01, 0x02, 0x02, 0x03, 0x08, 0x04, 0x00 },
+     {0}, false, "JPEGXSMain4444_12Profile" },         // 544
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,
+       0x04, 0x01, 0x02, 0x02, 0x03, 0x08, 0x05, 0x00 },
+     {0}, false, "JPEGXSLight422_10Profile" },         // 545
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,
+       0x04, 0x01, 0x02, 0x02, 0x03, 0x08, 0x06, 0x00 },
+     {0}, false, "JPEGXSLight444_12Profile" },         // 546
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,
+       0x04, 0x01, 0x02, 0x02, 0x03, 0x08, 0x07, 0x00 },
+     {0}, false, "JPEGXSLightSubline422_10Profile" },  // 547
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,
+       0x04, 0x01, 0x02, 0x02, 0x03, 0x08, 0x08, 0x00 },
+     {0}, false, "JPEGXSHigh444_12Profile" },          // 548
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,
+       0x04, 0x01, 0x02, 0x02, 0x03, 0x08, 0x09, 0x00 },
+     {0}, false, "JPEGXSHigh4444_12Profile" },         // 549
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x7f, 0x01, 0x01,
+       0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x81, 0x02 },
+     {0}, false, "JPEGXSSubDescriptor" },              // 550
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e,
+       0x04, 0x01, 0x06, 0x0b, 0x00, 0x00 ,0x00, 0x00 },
+     {0}, false, "JPEGXSCodingParameters" },           // 551
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e,
+       0x04, 0x01, 0x06, 0x0b, 0x01, 0x00 ,0x00, 0x00 },
+     {0}, false, "JPEGXSPpih" },                       // 552
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e,
+       0x04, 0x01, 0x06, 0x0b, 0x02, 0x00 ,0x00, 0x00 },
+     {0}, false, "JPEGXSPlev" },                       // 553
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e,
+       0x04, 0x01, 0x06, 0x0b, 0x03, 0x00 ,0x00, 0x00 },
+     {0}, false, "JPEGXSWf" },                         // 554
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e,
+       0x04, 0x01, 0x06, 0x0b, 0x04, 0x00 ,0x00, 0x00 },
+     {0}, false, "JPEGXSHf" },                         // 555
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e,
+       0x04, 0x01, 0x06, 0x0b, 0x05, 0x00 ,0x00, 0x00 },
+     {0}, false, "JPEGXSNc" },                         // 556
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e,
+       0x04, 0x01, 0x06, 0x0b, 0x06, 0x00 ,0x00, 0x00 },
+     {0}, false, "JPEGXSComponentTable" },             // 557
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e,
+       0x04, 0x01, 0x06, 0x0b, 0x07, 0x00 ,0x00, 0x00 },
+     {0}, true, "JPEGXSCw" },                         // 558
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e,
+       0x04, 0x01, 0x06, 0x0b, 0x08, 0x00 ,0x00, 0x00 },
+     {0}, true, "JPEGXSHsl" },                       // 559
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e,
+       0x04, 0x01, 0x06, 0x0b, 0x09, 0x00 ,0x00, 0x00 },
+     {0}, true, "JPEGXSMaximumBitRate" },            // 560
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x02, 0x01, 0x01, 
+       0x0d, 0x01, 0x03, 0x01, 0x15, 0x01, 0x1a, 0x00 },
+     {0}, false, "JPEGXSEssence" }, // 561. frame wrapped JPEG XS
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, 
+       0x04, 0x01, 0x01, 0x01, 0x01, 0x0b, 0x00, 0x00 },
+     {0}, false, "TransferCharacteristic_HLG" }, // 562
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, 
+       0x04, 0x01, 0x01, 0x01, 0x01, 0x05, 0x00, 0x00 },
+     {0}, false, "TransferCharacteristic_BT.1361" },  // 563
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x01, 
+       0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00 },
+     {0}, false, "TransferCharacteristic_BT470" }, // 564
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x01, 
+       0x04, 0x01, 0x01, 0x01, 0x01, 0x03, 0x00, 0x00 },
+     {0}, false, "TransferCharacteristic_ST240M" }, // 565
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x08, 
+       0x04, 0x01, 0x01, 0x01, 0x01, 0x07, 0x00, 0x00 },
+     {0}, false, "TransferCharacteristic_ST428" }, // 566
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, 
+       0x04, 0x01, 0x01, 0x01, 0x02, 0x05, 0x00, 0x00 },
+     {0}, false, "CodingEquations_BGR" }, // 567
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x06, 
+       0x04, 0x01, 0x01, 0x01, 0x02, 0x03, 0x00, 0x00 },
+     {0}, false, "CodingEquations_ST240M" }, // 568
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, 
+       0x04, 0x01, 0x01, 0x01, 0x02, 0x04, 0x00, 0x00 },
+     {0}, false, "CodingEquations_YCGCO" }, // 569
    { {0}, {0}, false, 0 },
-
 };
 
 //
diff --git a/src/MDD.h b/src/MDD.h
index ba0cbbf..730d74b 100755
--- a/src/MDD.h
+++ b/src/MDD.h
@@ -571,6 +571,40 @@ namespace ASDCP {
 	MDD_IABSoundfield, // 533
 	MDD_IMF_IABEssenceClipWrappedElement, // 534
 	MDD_ImmersiveAudioCoding, // 535
+	MDD_MXFGCJPEGXSPictures, // 536 
+	MDD_MXFGCFrameWrappedProgressiveJPEGXSPictures, // 537
+	MDD_MXFGCFrameWrappedInterlacedJPEGXSPictures,  // 538
+	MDD_MXFGCClipWrappedJPEGXSPictures, // 539
+	MDD_JPEGXSPictureCodingSchemes, // 540
+	MDD_JPEGXSUnrestrictedCodestream, // 541
+	MDD_JPEGXSMain422_10Profile, // 542
+	MDD_JPEGXSMain444_12Profile, // 543
+	MDD_JPEGXSMain4444_12Profile, // 544
+	MDD_JPEGXSLight422_10Profile, // 545
+	MDD_JPEGXSLight444_12Profile, // 546
+	MDD_JPEGXSLightSubline422_10Profile, // 547
+	MDD_JPEGXSHigh444_12Profile, // 548
+	MDD_JPEGXSHigh4444_12Profile, // 549
+	MDD_JPEGXSPictureSubDescriptor, // 550
+	MDD_JPEGXSCodingParameters, // 551
+	MDD_JPEGXSPictureSubDescriptor_JPEGXSPpih, // 552
+	MDD_JPEGXSPictureSubDescriptor_JPEGXSPlev, // 553
+	MDD_JPEGXSPictureSubDescriptor_JPEGXSWf,   // 554
+	MDD_JPEGXSPictureSubDescriptor_JPEGXSHf,   // 555
+	MDD_JPEGXSPictureSubDescriptor_JPEGXSNc,   // 556
+	MDD_JPEGXSPictureSubDescriptor_JPEGXSComponentTable, // 557
+	MDD_JPEGXSPictureSubDescriptor_JPEGXSCw,   // 558
+	MDD_JPEGXSPictureSubDescriptor_JPEGXSHsl,  // 559
+	MDD_JPEGXSPictureSubDescriptor_JPEGXSMaximumBitRate, // 560
+	MDD_JPEGXSEssence, // 561
+	MDD_TransferCharacteristic_HLG, // 562
+	MDD_TransferCharacteristic_BT1361, // 563
+	MDD_TransferCharacteristic_BT470, // 564
+	MDD_TransferCharacteristic_ST240M, // 565
+	MDD_TransferCharacteristic_ST428, // 566
+	MDD_CodingEquations_BGR, // 567
+	MDD_CodingEquations_ST240M, // 568
+	MDD_CodingEquations_YCGCO, // 569
 	MDD_Max
     }; // enum MDD_t