summaryrefslogtreecommitdiff
path: root/src/MDD.cpp
diff options
context:
space:
mode:
authorjhurst <jhurst@cinecert.com>2018-09-14 07:27:20 +0000
committerjhurst <>2018-09-14 07:27:20 +0000
commit1193b2819266ca836d0b319d777e4e1a1cb51a49 (patch)
tree95e8d9623f9fc5fa61a5ff1451e7fd6b11fb8ae4 /src/MDD.cpp
parent9ff2485b9d68a206a00835e1e9862c24eee7eabc (diff)
ACES contribution from AMPAS/Ruppel
Diffstat (limited to 'src/MDD.cpp')
-rw-r--r--src/MDD.cpp39
1 files changed, 29 insertions, 10 deletions
diff --git a/src/MDD.cpp b/src/MDD.cpp
index 5724269..a779c32 100644
--- a/src/MDD.cpp
+++ b/src/MDD.cpp
@@ -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
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" },
@@ -1588,8 +1588,27 @@ 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, // 504
+ 0x0d, 0x01, 0x03, 0x01, 0x02, 0x19, 0x01, 0x00, },
+ {0}, false, "MXFGCFrameWrappedACESPictures" },
+ { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 505
+ 0x04, 0x01, 0x02, 0x02, 0x03, 0x04, 0x01, 0x00, },
+ {0}, false, "ACESUncompressedMonoscopicWithoutAlpha" },
+ { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 506
+ 0x04, 0x01, 0x02, 0x02, 0x03, 0x04, 0x02, 0x00, },
+ {0}, false, "ACESUncompressedMonoscopicWithAlpha" },
+ { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x02, 0x01, 0x01, // 508
+ 0x0d, 0x01, 0x03, 0x01, 0x15, 0x01, 0x12, 0x00 },
+ {0}, false, "ACESFrameWrappedEssence" },
+ { {0}, {0}, false, 0 },
+
+};
//
// end MDD.cpp