diff --git a/mkvmuxer.cpp b/mkvmuxer.cpp index 0f76838..e5883b0 100644 --- a/mkvmuxer.cpp +++ b/mkvmuxer.cpp @@ -1003,8 +1003,8 @@ bool Colour::Write(IMkvWriter* writer) const { if (!WriteEbmlMasterElement(writer, kMkvColour, size)) return false; - if (matrix != kUnspecifiedColourValue && - !WriteEbmlElement(writer, kMkvMatrix, matrix)) { + if (matrix_coefficients != kUnspecifiedColourValue && + !WriteEbmlElement(writer, kMkvMatrixCoefficients, matrix_coefficients)) { return false; } if (bits_per_channel != kUnspecifiedColourValue && @@ -1087,8 +1087,8 @@ bool Colour::SetMasteringMetadata(const MasteringMetadata& mastering_metadata) { uint64 Colour::PayloadSize() const { uint64 size = 0; - if (matrix != kUnspecifiedColourValue) - size += EbmlElementSize(kMkvMatrix, matrix); + if (matrix_coefficients != kUnspecifiedColourValue) + size += EbmlElementSize(kMkvMatrixCoefficients, matrix_coefficients); if (bits_per_channel != kUnspecifiedColourValue) size += EbmlElementSize(kMkvBitsPerChannel, bits_per_channel); if (chroma_subsampling_horz != kUnspecifiedColourValue) @@ -1248,7 +1248,7 @@ bool VideoTrack::SetColour(const Colour& colour) { return false; } - colour_ptr->matrix = colour.matrix; + colour_ptr->matrix_coefficients = colour.matrix_coefficients; colour_ptr->bits_per_channel = colour.bits_per_channel; colour_ptr->chroma_subsampling_horz = colour.chroma_subsampling_horz; colour_ptr->chroma_subsampling_vert = colour.chroma_subsampling_vert; diff --git a/mkvmuxer.hpp b/mkvmuxer.hpp index d8c2a39..4d3681e 100644 --- a/mkvmuxer.hpp +++ b/mkvmuxer.hpp @@ -394,7 +394,7 @@ class Colour { public: static const uint64 kUnspecifiedColourValue; Colour() - : matrix(kUnspecifiedColourValue), + : matrix_coefficients(kUnspecifiedColourValue), bits_per_channel(kUnspecifiedColourValue), chroma_subsampling_horz(kUnspecifiedColourValue), chroma_subsampling_vert(kUnspecifiedColourValue), @@ -421,7 +421,7 @@ class Colour { return mastering_metadata_; } - uint64 matrix; + uint64 matrix_coefficients; uint64 bits_per_channel; uint64 chroma_subsampling_horz; uint64 chroma_subsampling_vert; diff --git a/mkvparser.cpp b/mkvparser.cpp index 53d1ef9..9f387d5 100644 --- a/mkvparser.cpp +++ b/mkvparser.cpp @@ -5111,9 +5111,10 @@ bool Colour::Parse(IMkvReader* reader, long long colour_start, if (status < 0) return false; - if (child_id == mkvmuxer::kMkvMatrix) { - colour_ptr->matrix = UnserializeUInt(reader, read_pos, child_size); - if (colour_ptr->matrix < 0) + if (child_id == mkvmuxer::kMkvMatrixCoefficients) { + colour_ptr->matrix_coefficients = + UnserializeUInt(reader, read_pos, child_size); + if (colour_ptr->matrix_coefficients < 0) return false; } else if (child_id == mkvmuxer::kMkvBitsPerChannel) { colour_ptr->bits_per_channel = diff --git a/mkvparser.hpp b/mkvparser.hpp index d05796d..d05bc52 100644 --- a/mkvparser.hpp +++ b/mkvparser.hpp @@ -437,7 +437,7 @@ struct Colour { // Unless otherwise noted all values assigned upon construction are the // equivalent of unspecified/default. Colour() - : matrix(kValueNotPresent), + : matrix_coefficients(kValueNotPresent), bits_per_channel(kValueNotPresent), chroma_subsampling_horz(kValueNotPresent), chroma_subsampling_vert(kValueNotPresent), @@ -459,7 +459,7 @@ struct Colour { static bool Parse(IMkvReader* reader, long long element_start, long long element_size, Colour** colour); - long long matrix; + long long matrix_coefficients; long long bits_per_channel; long long chroma_subsampling_horz; long long chroma_subsampling_vert; diff --git a/sample.cpp b/sample.cpp index 7c2728b..9b644ce 100644 --- a/sample.cpp +++ b/sample.cpp @@ -238,8 +238,9 @@ int main(int argc, char* argv[]) { const mkvparser::Colour* const colour = pVideoTrack->GetColour(); if (colour) { printf("\t\tVideo Colour:\n"); - if (ColourValuePresent(colour->matrix)) - printf("\t\t\tMatrix: %lld\n", colour->matrix); + if (ColourValuePresent(colour->matrix_coefficients)) + printf("\t\t\tMatrixCoefficients: %lld\n", + colour->matrix_coefficients); if (ColourValuePresent(colour->bits_per_channel)) printf("\t\t\tBitsPerChannel: %lld\n", colour->bits_per_channel); if (ColourValuePresent(colour->chroma_subsampling_horz)) diff --git a/sample_muxer.cpp b/sample_muxer.cpp index d9e8d62..497ff83 100644 --- a/sample_muxer.cpp +++ b/sample_muxer.cpp @@ -201,8 +201,8 @@ bool CopyColour(const mkvparser::Colour& parser_colour, if (!muxer_colour) return false; - if (ColourValuePresent(parser_colour.matrix)) - muxer_colour->matrix = parser_colour.matrix; + if (ColourValuePresent(parser_colour.matrix_coefficients)) + muxer_colour->matrix_coefficients = parser_colour.matrix_coefficients; if (ColourValuePresent(parser_colour.bits_per_channel)) muxer_colour->bits_per_channel = parser_colour.bits_per_channel; if (ColourValuePresent(parser_colour.chroma_subsampling_horz)) diff --git a/webmids.hpp b/webmids.hpp index 3b69227..0808d28 100644 --- a/webmids.hpp +++ b/webmids.hpp @@ -97,7 +97,7 @@ enum MkvId { // end video // colour kMkvColour = 0x55B0, - kMkvMatrix = 0x55B1, + kMkvMatrixCoefficients = 0x55B1, kMkvBitsPerChannel = 0x55B2, kMkvChromaSubsamplingHorz = 0x55B3, kMkvChromaSubsamplingVert = 0x55B4,