Colour element: TransferFunction renamed to TransferCharacteristics.

Change-Id: I02e8d9b375d3aeba26d99866df90e25e1605143f

mkvmuxer.cpp

@@ -1042,8 +1042,9 @@ bool Colour::Write(IMkvWriter* writer) const {
       !WriteEbmlElement(writer, kMkvRange, range)) {
     return false;
   }
-  if (transfer_function != kUnspecifiedColourValue &&
+  if (transfer_characteristics != kUnspecifiedColourValue &&
-      !WriteEbmlElement(writer, kMkvTransferFunction, transfer_function)) {
+      !WriteEbmlElement(writer, kMkvTransferCharacteristics,
+                        transfer_characteristics)) {
     return false;
   }
   if (primaries != kUnspecifiedColourValue &&
@@ -1105,8 +1106,9 @@ uint64 Colour::PayloadSize() const {
     size += EbmlElementSize(kMkvChromaSitingVert, chroma_siting_vert);
   if (range != kUnspecifiedColourValue)
     size += EbmlElementSize(kMkvRange, range);
-  if (transfer_function != kUnspecifiedColourValue)
+  if (transfer_characteristics != kUnspecifiedColourValue)
-    size += EbmlElementSize(kMkvTransferFunction, transfer_function);
+    size +=
+        EbmlElementSize(kMkvTransferCharacteristics, transfer_characteristics);
   if (primaries != kUnspecifiedColourValue)
     size += EbmlElementSize(kMkvPrimaries, primaries);
   if (max_cll != kUnspecifiedColourValue)
@@ -1257,7 +1259,7 @@ bool VideoTrack::SetColour(const Colour& colour) {
   colour_ptr->chroma_siting_horz = colour.chroma_siting_horz;
   colour_ptr->chroma_siting_vert = colour.chroma_siting_vert;
   colour_ptr->range = colour.range;
-  colour_ptr->transfer_function = colour.transfer_function;
+  colour_ptr->transfer_characteristics = colour.transfer_characteristics;
   colour_ptr->primaries = colour.primaries;
   colour_ptr->max_cll = colour.max_cll;
   colour_ptr->max_fall = colour.max_fall;

mkvmuxer.hpp

@@ -403,7 +403,7 @@ class Colour {
         chroma_siting_horz(kUnspecifiedColourValue),
         chroma_siting_vert(kUnspecifiedColourValue),
         range(kUnspecifiedColourValue),
-        transfer_function(kUnspecifiedColourValue),
+        transfer_characteristics(kUnspecifiedColourValue),
         primaries(kUnspecifiedColourValue),
         max_cll(kUnspecifiedColourValue),
         max_fall(kUnspecifiedColourValue),
@@ -430,7 +430,7 @@ class Colour {
   uint64 chroma_siting_horz;
   uint64 chroma_siting_vert;
   uint64 range;
-  uint64 transfer_function;
+  uint64 transfer_characteristics;
   uint64 primaries;
   uint64 max_cll;
   uint64 max_fall;

mkvparser.cpp

@@ -5155,10 +5155,10 @@ bool Colour::Parse(IMkvReader* reader, long long colour_start,
       colour_ptr->range = UnserializeUInt(reader, read_pos, child_size);
       if (colour_ptr->range < 0)
         return false;
-    } else if (child_id == mkvmuxer::kMkvTransferFunction) {
+    } else if (child_id == mkvmuxer::kMkvTransferCharacteristics) {
-      colour_ptr->transfer_function =
+      colour_ptr->transfer_characteristics =
           UnserializeUInt(reader, read_pos, child_size);
-      if (colour_ptr->transfer_function < 0)
+      if (colour_ptr->transfer_characteristics < 0)
         return false;
     } else if (child_id == mkvmuxer::kMkvPrimaries) {
       colour_ptr->primaries = UnserializeUInt(reader, read_pos, child_size);

mkvparser.hpp

@@ -446,7 +446,7 @@ struct Colour {
         chroma_siting_horz(kValueNotPresent),
         chroma_siting_vert(kValueNotPresent),
         range(kValueNotPresent),
-        transfer_function(kValueNotPresent),
+        transfer_characteristics(kValueNotPresent),
         primaries(kValueNotPresent),
         max_cll(kValueNotPresent),
         max_fall(kValueNotPresent),
@@ -468,7 +468,7 @@ struct Colour {
   long long chroma_siting_horz;
   long long chroma_siting_vert;
   long long range;
-  long long transfer_function;
+  long long transfer_characteristics;
   long long primaries;
   long long max_cll;
   long long max_fall;

sample.cpp

@@ -261,8 +261,9 @@ int main(int argc, char* argv[]) {
           printf("\t\t\tChromaSitingVert: %lld\n", colour->chroma_siting_vert);
         if (ColourValuePresent(colour->range))
           printf("\t\t\tRange: %lld\n", colour->range);
-        if (ColourValuePresent(colour->transfer_function))
+        if (ColourValuePresent(colour->transfer_characteristics))
-          printf("\t\t\tTransferFunction: %lld\n", colour->transfer_function);
+          printf("\t\t\tTransferCharacteristics: %lld\n",
+                 colour->transfer_characteristics);
         if (ColourValuePresent(colour->primaries))
           printf("\t\t\tPrimaries: %lld\n", colour->primaries);
         if (ColourValuePresent(colour->max_cll))

sample_muxer.cpp

@@ -221,8 +221,9 @@ bool CopyColour(const mkvparser::Colour& parser_colour,
     muxer_colour->chroma_siting_vert = parser_colour.chroma_siting_vert;
   if (ColourValuePresent(parser_colour.range))
     muxer_colour->range = parser_colour.range;
-  if (ColourValuePresent(parser_colour.transfer_function))
+  if (ColourValuePresent(parser_colour.transfer_characteristics))
-    muxer_colour->transfer_function = parser_colour.transfer_function;
+    muxer_colour->transfer_characteristics =
+        parser_colour.transfer_characteristics;
   if (ColourValuePresent(parser_colour.primaries))
     muxer_colour->primaries = parser_colour.primaries;
   if (ColourValuePresent(parser_colour.max_cll))

webmids.hpp

@@ -106,7 +106,7 @@ enum MkvId {
   kMkvChromaSitingHorz = 0x55B7,
   kMkvChromaSitingVert = 0x55B8,
   kMkvRange = 0x55B9,
-  kMkvTransferFunction = 0x55BA,
+  kMkvTransferCharacteristics = 0x55BA,
   kMkvPrimaries = 0x55BB,
   kMkvMaxCLL = 0x55BC,
   kMkvMaxFALL = 0x55BD,