X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2FMDD.cpp;h=fa88016084fbc775aeebc8177031e0b735350762;hb=97d949f08c2263ee1d2805c9b3caa9b2dc6f9176;hp=5afb75edc2216ddb707af064911613ee5bc6e463;hpb=252740d6f7d8924c6af30e55d2da487356a0acdc;p=asdcplib.git diff --git a/src/MDD.cpp b/src/MDD.cpp index 5afb75e..fa88016 100644 --- 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" }, @@ -995,7 +995,156 @@ static const ASDCP::MDDEntry s_MDD_Table[] = { { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 319 0x03, 0x02, 0x01, 0x0f, 0x00, 0x00, 0x00, 0x00 }, {0}, false, "DCAudioChannel_VIN" }, - + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 320 + 0x03, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00 }, + {0}, false, "DCAudioSoundfield_51" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 321 + 0x03, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00 }, + {0}, false, "DCAudioSoundfield_71" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 322 + 0x03, 0x02, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00 }, + {0}, false, "DCAudioSoundfield_SDS" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 323 + 0x03, 0x02, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00 }, + {0}, false, "DCAudioSoundfield_61" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 324 + 0x03, 0x02, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00 }, + {0}, false, "DCAudioSoundfield_M" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x02, 0x01, 0x01, // 325 + 0x0d, 0x01, 0x03, 0x01, 0x16, 0x01, 0x02, 0x00 }, + {0}, false, "WAVEssenceClip" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 326 + 0x04, 0x02, 0x02, 0x10, 0x04, 0x01, 0x00, 0x00 }, + {0}, false, "IMFAudioChannelCfg_MCA" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 327 + 0x03, 0x02, 0x01, 0x20, 0x01, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioChannel_M1" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 328 + 0x03, 0x02, 0x01, 0x20, 0x02, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioChannel_M2" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 329 + 0x03, 0x02, 0x01, 0x20, 0x03, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioChannel_Lt" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 330 + 0x03, 0x02, 0x01, 0x20, 0x04, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioChannel_Rt" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 331 + 0x03, 0x02, 0x01, 0x20, 0x05, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioChannel_Lst" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 332 + 0x03, 0x02, 0x01, 0x20, 0x06, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioChannel_Rst" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 333 + 0x03, 0x02, 0x01, 0x20, 0x07, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioChannel_S" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 334 + 0x03, 0x02, 0x01, 0x20, 0x08, 0x00, 0x00, 0x00 }, + {0}, false, "IMFNumberedSourceChannel" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 335 + 0x03, 0x02, 0x02, 0x20, 0x01, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioSoundfield_ST" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 336 + 0x03, 0x02, 0x02, 0x20, 0x02, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioSoundfield_DM" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 337 + 0x03, 0x02, 0x02, 0x20, 0x03, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioSoundfield_DNS" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 338 + 0x03, 0x02, 0x02, 0x20, 0x04, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioSoundfield_30" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 339 + 0x03, 0x02, 0x02, 0x20, 0x05, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioSoundfield_40" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 340 + 0x03, 0x02, 0x02, 0x20, 0x06, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioSoundfield_50" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 341 + 0x03, 0x02, 0x02, 0x20, 0x07, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioSoundfield_60" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 342 + 0x03, 0x02, 0x02, 0x20, 0x08, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioSoundfield_70" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 343 + 0x03, 0x02, 0x02, 0x20, 0x09, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioSoundfield_LtRt" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 344 + 0x03, 0x02, 0x02, 0x20, 0x0a, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioSoundfield_51Ex" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 345 + 0x03, 0x02, 0x02, 0x20, 0x0b, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioSoundfield_HI" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 346 + 0x03, 0x02, 0x02, 0x20, 0x0c, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioSoundfield_VIN" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 347 + 0x03, 0x02, 0x03, 0x20, 0x01, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioGroup_MPg" }, + { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 348 + 0x03, 0x02, 0x03, 0x20, 0x02, 0x00, 0x00, 0x00 }, + {0}, false, "IMFAudioGroup_DVS" }, + { { 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 } };