o removed waywars #endif
[asdcplib.git] / src / MDD.h
index 0e8fb24d708d1494923accb506cf2a06cfb82efd..23d6730d673081ea5c0de2f3dcac894a76261c5d 100755 (executable)
--- a/src/MDD.h
+++ b/src/MDD.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2006-2016, John Hurst
+Copyright (c) 2006-2018, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -278,7 +278,7 @@ namespace ASDCP {
         MDD_JPEG2000PictureSubDescriptor_PictureComponentSizing,  // 240
         MDD_JPEG2000PictureSubDescriptor_CodingStyleDefault,  // 241
         MDD_JPEG2000PictureSubDescriptor_QuantizationDefault,  // 242
-        MDD_DM_Framework,  // 243
+        MDD_DescriptiveFramework,  // 243
         MDD_DM_Set,  // 244
         MDD_EncryptedContainerLabel,  // 245
         MDD_CryptographicFrameworkLabel,  // 246
@@ -395,8 +395,8 @@ namespace ASDCP {
        MDD_JP2KEssenceCompression_BroadcastProfile_5, // 357
        MDD_JP2KEssenceCompression_BroadcastProfile_6, // 358
        MDD_JP2KEssenceCompression_BroadcastProfile_7, // 359
-       MDD_WaveAudioDescriptor_ReferenceImageEditRate, // 360
-       MDD_WaveAudioDescriptor_ReferenceAudioAlignmentLevel, // 361
+       MDD_GenericSoundEssenceDescriptor_ReferenceImageEditRate, // 360
+       MDD_GenericSoundEssenceDescriptor_ReferenceAudioAlignmentLevel, // 361
        MDD_GenericPictureEssenceDescriptor_AlternativeCenterCuts, // 362
        MDD_GenericPictureEssenceDescriptor_ActiveHeight, // 363
        MDD_GenericPictureEssenceDescriptor_ActiveWidth, // 364
@@ -427,102 +427,134 @@ namespace ASDCP {
        MDD_MCALabelSubDescriptor_MCAPartitionNumber, // 389
        MDD_MCALabelSubDescriptor_MCAAudioContentKind, // 390
        MDD_MCALabelSubDescriptor_MCAAudioElementKind, // 391
-       MDD_PIMFDynamicMetadataWrappingFrame, // 392
-       MDD_PIMFDynamicMetadataEssence, // 393
-       MDD_PIMFDynamicMetadataDescriptor, // 394
-       MDD_PIMFDynamicMetadataDescriptor_GlobalPayloadSID, // 395
-
-       //
-       MDD_MXFGCI1FrameWrappedPictureElement, // 396
-       MDD_MXFGCP1FrameWrappedPictureElement, // 397
-               
-               
-               MDD_TransferCharacteristics_709,
-               MDD_TransferCharacteristics_2020,  //
-               MDD_TransferCharacteristics_xvYCC,
-               MDD_TransferCharacteristics_St2084,     
-               MDD_TransferCharacteristics_linear,
-
-       
-               MDD_CodingEquations_601,  //
-               MDD_CodingEquations_709,
-               MDD_CodingEquations_Rec2020,
-       
-               MDD_ColorPrimaries_BT709, //
-               MDD_ColorPrimaries_BT2020,
-               MDD_ColorPrimaries_P3D65,
-               MDD_ColorPrimaries_XYZ,
-
-
-               MDD_GenericPictureEssenceDescriptor_MasteringDisplayPrimaries,
-               MDD_GenericPictureEssenceDescriptor_MasteringDisplayWhitePointChromaticity,
-               MDD_GenericPictureEssenceDescriptor_MasteringDisplayMaximumLuminance,
-               MDD_GenericPictureEssenceDescriptor_MasteringDisplayMinimumLuminance,
-
-               MDD_JP2KEssenceCompression_IMFProfile_2K_Lossy, //
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy,
-               MDD_JP2KEssenceCompression_IMFProfile_8K_Lossy,
-
-               MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible,
-               MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible,
-               
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_1_1, //
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_2_1, //
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_3_1,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_4_1,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_4_2,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_5_1,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_5_2,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_5_3,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_6_1,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_6_2,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_6_3,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_6_4,
-
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_1,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_2,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_3,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_4,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_5,
-               
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_1,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_2,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_3,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_4,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_5,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_6,
-               
-               MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_1_0,
-               MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_2_0,
-               MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_3_0,
-               MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_4_0,
-               MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_5_0,
-               MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_6_0,
-               
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_1_0,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_2_0,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_3_0,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_4_0,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_5_0,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_6_0,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_7_0,
-               MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_8_0,
-               
-    MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_1_0,
-       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_2_0,
-       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_3_0,
-       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_4_0,
-       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_5_0,
-       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_6_0,
-       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_7_0,
-       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_8_0,
-       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_9_0,
-       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_10_0,
-
-       MDD_SMPTE382MDefaultUncompressedSoundCoding,
-               
-        MDD_Max
+       MDD_MXFGCI1FrameWrappedPictureElement, // 392
+       MDD_MXFGCP1FrameWrappedPictureElement, // 393
+       MDD_TransferCharacteristic_ITU709, // 394
+       MDD_TransferCharacteristic_ITU2020,  // 395
+       MDD_TransferCharacteristic_IEC6196624_xvYCC, // 396
+       MDD_TransferCharacteristic_SMPTEST2084, // 397
+       MDD_TransferCharacteristic_linear, // 398
+       MDD_CodingEquations_601, // 399
+       MDD_CodingEquations_709, // 400
+       MDD_CodingEquations_Rec2020, // 401
+       MDD_ColorPrimaries_ITU709, // 402
+       MDD_ColorPrimaries_ITU2020, // 403
+       MDD_ColorPrimaries_P3D65, // 404
+       MDD_ColorPrimaries_ACES, // 405
+       MDD_GenericPictureEssenceDescriptor_MasteringDisplayPrimaries, // 406
+       MDD_GenericPictureEssenceDescriptor_MasteringDisplayWhitePointChromaticity, // 407
+       MDD_GenericPictureEssenceDescriptor_MasteringDisplayMaximumLuminance, // 408
+       MDD_GenericPictureEssenceDescriptor_MasteringDisplayMinimumLuminance, // 409
+       MDD_JP2KEssenceCompression_IMFProfile_2K_Lossy, // 410
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy, // 411
+       MDD_JP2KEssenceCompression_IMFProfile_8K_Lossy, // 412
+       MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible, // 413
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible, // 414
+       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible, // 415
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_1_1, // 416
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_2_1, // 417
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_3_1, // 418
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_4_1, // 419
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_4_2, // 420
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_5_1, // 421
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_5_2, // 422
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_5_3, // 423
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_6_1, // 424
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_6_2, // 425
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_6_3, // 426
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_6_4, // 427
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_1, // 428
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_2, // 429
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_3, // 430
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_4, // 431
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_5, // 432
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_1, // 433
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_2, // 434
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_3, // 435
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_4, // 436
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_5, // 437
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_6, // 438
+       MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_1_0, // 439
+       MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_2_0, // 440
+       MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_3_0, // 441
+       MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_4_0, // 442
+       MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_5_0, // 443
+       MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_6_0, // 444
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_1_0, // 445
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_2_0, // 446
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_3_0, // 447
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_4_0, // 448
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_5_0, // 449
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_6_0, // 450
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_7_0, // 451
+       MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_8_0, // 452
+       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_1_0, // 453
+       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_2_0, // 454
+       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_3_0, // 455
+       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_4_0, // 456
+       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_5_0, // 457
+       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_6_0, // 458
+       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_7_0, // 459
+       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_8_0, // 460
+       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_9_0, // 461
+       MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_10_0, // 462
+       MDD_SMPTE382MDefaultUncompressedSoundCoding, // 463
+       MDD_PIMFDynamicMetadataWrappingFrame, // 464
+       MDD_PIMFDynamicMetadataEssence, // 465
+       MDD_PIMFDynamicMetadataDescriptor, // 466
+       MDD_PIMFDynamicMetadataDescriptor_GlobalPayloadSID, // 467
+       MDD_ColorPrimaries_ITU470_PAL, // 468
+       MDD_ColorPrimaries_SMPTE170M, // 469
+       MDD_ACESPictureSubDescriptor, //  470
+       MDD_ACESPictureSubDescriptor_ACESAuthoringInformation, //  471
+       MDD_ACESPictureSubDescriptor_ACESMasteringDisplayPrimaries, // 472
+       MDD_ACESPictureSubDescriptor_ACESMasteringDisplayWhitePointChromaticity, // 473
+       MDD_ACESPictureSubDescriptor_ACESMasteringDisplayMaximumLuminance, // 474
+       MDD_ACESPictureSubDescriptor_ACESMasteringDisplayMinimumLuminance, // 475
+       MDD_TargetFrameSubDescriptor, //  476
+       MDD_TargetFrameSubDescriptor_TargetFrameAncillaryResourceID, // 477
+       MDD_TargetFrameSubDescriptor_MediaType, // 478
+       MDD_TargetFrameSubDescriptor_TargetFrameIndex, // 479
+       MDD_TargetFrameSubDescriptor_TargetFrameTransferCharacteristic, // 480
+       MDD_TargetFrameSubDescriptor_TargetFrameColorPrimaries, // 481
+       MDD_TargetFrameSubDescriptor_TargetFrameComponentMaxRef, // 482
+       MDD_TargetFrameSubDescriptor_TargetFrameComponentMinRef, // 483
+       MDD_TargetFrameSubDescriptor_TargetFrameEssenceStreamID, // 484
+       MDD_TargetFrameSubDescriptor_ACESPictureSubDescriptorInstanceID, // 485
+       MDD_TargetFrameSubDescriptor_TargetFrameViewingEnvironment, // 486
+       MDD_TransferCharacteristic_Gamma_2_6, // 487
+       MDD_TransferCharacteristic_sRGB, // 488
+       MDD_TheatricalViewingEnvironment, // 489
+       MDD_HDTVReferenceViewingEnvironment, // 490
+       MDD_HDRReferenceViewingEnvironment, // 491
+       MDD_FrameWrappedISXDData, // 492
+       MDD_FrameWrappedISXDContainer, // 493
+       MDD_ISXDDataEssenceDescriptor, // 494
+       MDD_ISXDDataEssenceDescriptor_NamespaceURI, // 495
+       MDD_UTF_8_Text_DataEssenceCoding, // 496
+       MDD_TextBasedDMFramework, // 497
+       MDD_TextBasedDMFramework_ObjectRef, // 498
+       MDD_TextBasedObject, // 499
+       MDD_TextBasedObject_PayloadSchemeID, // 500
+       MDD_TextBasedObject_TextMIMEMediaType, // 501
+       MDD_TextBasedObject_RFC5646TextLanguageCode, // 502
+       MDD_TextBasedObject_TextDataDescription, // 503
+       MDD_GenericStreamTextBasedSet, // 504
+       MDD_GenericStreamTextBasedSet_GenericStreamSID, // 505
+       MDD_DescriptiveObject,   // 506
+       MDD_DescriptiveFramework_LinkedDescriptiveFrameworkPlugInId, // 507
+       MDD_DescriptiveObject_LinkedDescriptiveObjectPlugInId, // 508
+       MDD_Preface_ApplicationSchemes,  // 509
+       MDD_Preface_ConformsToSpecifications, // 510
+       MDD_MXFTextBasedFramework,  // 511
+       MDD_ColorPrimaries_SMPTE_DCDM, // 512
+       MDD_ColorPrimaries_CinemaMezzanine, // 513
+       MDD_MXFGCFrameWrappedACESPictures, // 514
+       MDD_ACESUncompressedMonoscopicWithoutAlpha, // 515
+       MDD_ACESUncompressedMonoscopicWithAlpha, // 516
+       MDD_ACESFrameWrappedEssence, // 517
+       MDD_DCAudioChannel_FSKSyncSignalChannel, // 518
+       MDD_Max
     }; // enum MDD_t
 
     //