generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mkvmuxer: Use kValueNotPresent in Colour/MasteringMetadata.

Browse Source 
Consistent with parser/no reason for unique names.

Change-Id: Ic38bc8c14413dc85fbdc28d69aa89fa0bfa7382f
This commit is contained in:
Tom Finegan 2016-02-18 12:11:53 -08:00
parent 2d0912837c
commit c92e080f3a
2 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
mkvmuxer.cpp
View File

@ -29,8 +29,8 @@
namespace mkvmuxer { namespace mkvmuxer {
const float MasteringMetadata::kUnspecifiedMmValue = FLT_MAX; const float MasteringMetadata::kValueNotPresent = FLT_MAX;
const uint64 Colour::kUnspecifiedColourValue = UINT64_MAX; const uint64 Colour::kValueNotPresent = UINT64_MAX;
namespace { namespace {
// Deallocate the string designated by |dst|, and then copy the |src| // Deallocate the string designated by |dst|, and then copy the |src|
@ -893,11 +893,11 @@ bool MasteringMetadata::Write(IMkvWriter* writer) const {
if (!WriteEbmlMasterElement(writer, kMkvMasteringMetadata, size)) if (!WriteEbmlMasterElement(writer, kMkvMasteringMetadata, size))
return false; return false;
if (luminance_max != kUnspecifiedMmValue && if (luminance_max != kValueNotPresent &&
!WriteEbmlElement(writer, kMkvLuminanceMax, luminance_max)) { !WriteEbmlElement(writer, kMkvLuminanceMax, luminance_max)) {
return false; return false;
} }
if (luminance_min != kUnspecifiedMmValue && if (luminance_min != kValueNotPresent &&
!WriteEbmlElement(writer, kMkvLuminanceMin, luminance_min)) { !WriteEbmlElement(writer, kMkvLuminanceMin, luminance_min)) {
return false; return false;
} }
@ -959,9 +959,9 @@ bool MasteringMetadata::SetChromaticity(
uint64 MasteringMetadata::PayloadSize() const { uint64 MasteringMetadata::PayloadSize() const {
uint64 size = 0; uint64 size = 0;
if (luminance_max != kUnspecifiedMmValue) if (luminance_max != kValueNotPresent)
size += EbmlElementSize(kMkvLuminanceMax, luminance_max); size += EbmlElementSize(kMkvLuminanceMax, luminance_max);
if (luminance_min != kUnspecifiedMmValue) if (luminance_min != kValueNotPresent)
size += EbmlElementSize(kMkvLuminanceMin, luminance_min); size += EbmlElementSize(kMkvLuminanceMin, luminance_min);
if (r_) { if (r_) {
@ -1003,59 +1003,59 @@ bool Colour::Write(IMkvWriter* writer) const {
if (!WriteEbmlMasterElement(writer, kMkvColour, size)) if (!WriteEbmlMasterElement(writer, kMkvColour, size))
return false; return false;
if (matrix_coefficients != kUnspecifiedColourValue && if (matrix_coefficients != kValueNotPresent &&
!WriteEbmlElement(writer, kMkvMatrixCoefficients, matrix_coefficients)) { !WriteEbmlElement(writer, kMkvMatrixCoefficients, matrix_coefficients)) {
return false; return false;
} }
if (bits_per_channel != kUnspecifiedColourValue && if (bits_per_channel != kValueNotPresent &&
!WriteEbmlElement(writer, kMkvBitsPerChannel, bits_per_channel)) { !WriteEbmlElement(writer, kMkvBitsPerChannel, bits_per_channel)) {
return false; return false;
} }
if (chroma_subsampling_horz != kUnspecifiedColourValue && if (chroma_subsampling_horz != kValueNotPresent &&
!WriteEbmlElement(writer, kMkvChromaSubsamplingHorz, !WriteEbmlElement(writer, kMkvChromaSubsamplingHorz,
chroma_subsampling_horz)) { chroma_subsampling_horz)) {
return false; return false;
} }
if (chroma_subsampling_vert != kUnspecifiedColourValue && if (chroma_subsampling_vert != kValueNotPresent &&
!WriteEbmlElement(writer, kMkvChromaSubsamplingVert, !WriteEbmlElement(writer, kMkvChromaSubsamplingVert,
chroma_subsampling_vert)) { chroma_subsampling_vert)) {
return false; return false;
} }
if (cb_subsampling_horz != kUnspecifiedColourValue && if (cb_subsampling_horz != kValueNotPresent &&
!WriteEbmlElement(writer, kMkvCbSubsamplingHorz, cb_subsampling_horz)) { !WriteEbmlElement(writer, kMkvCbSubsamplingHorz, cb_subsampling_horz)) {
return false; return false;
} }
if (cb_subsampling_vert != kUnspecifiedColourValue && if (cb_subsampling_vert != kValueNotPresent &&
!WriteEbmlElement(writer, kMkvCbSubsamplingVert, cb_subsampling_vert)) { !WriteEbmlElement(writer, kMkvCbSubsamplingVert, cb_subsampling_vert)) {
return false; return false;
} }
if (chroma_siting_horz != kUnspecifiedColourValue && if (chroma_siting_horz != kValueNotPresent &&
!WriteEbmlElement(writer, kMkvChromaSitingHorz, chroma_siting_horz)) { !WriteEbmlElement(writer, kMkvChromaSitingHorz, chroma_siting_horz)) {
return false; return false;
} }
if (chroma_siting_vert != kUnspecifiedColourValue && if (chroma_siting_vert != kValueNotPresent &&
!WriteEbmlElement(writer, kMkvChromaSitingVert, chroma_siting_vert)) { !WriteEbmlElement(writer, kMkvChromaSitingVert, chroma_siting_vert)) {
return false; return false;
} }
if (range != kUnspecifiedColourValue && if (range != kValueNotPresent &&
!WriteEbmlElement(writer, kMkvRange, range)) { !WriteEbmlElement(writer, kMkvRange, range)) {
return false; return false;
} }
if (transfer_characteristics != kUnspecifiedColourValue && if (transfer_characteristics != kValueNotPresent &&
!WriteEbmlElement(writer, kMkvTransferCharacteristics, !WriteEbmlElement(writer, kMkvTransferCharacteristics,
transfer_characteristics)) { transfer_characteristics)) {
return false; return false;
} }
if (primaries != kUnspecifiedColourValue && if (primaries != kValueNotPresent &&
!WriteEbmlElement(writer, kMkvPrimaries, primaries)) { !WriteEbmlElement(writer, kMkvPrimaries, primaries)) {
return false; return false;
} }
if (max_cll != kUnspecifiedColourValue && if (max_cll != kValueNotPresent &&
!WriteEbmlElement(writer, kMkvMaxCLL, max_cll)) { !WriteEbmlElement(writer, kMkvMaxCLL, max_cll)) {
return false; return false;
} }
if (max_fall != kUnspecifiedColourValue && if (max_fall != kValueNotPresent &&
!WriteEbmlElement(writer, kMkvMaxFALL, max_fall)) { !WriteEbmlElement(writer, kMkvMaxFALL, max_fall)) {
return false; return false;
} }
@ -1088,32 +1088,32 @@ bool Colour::SetMasteringMetadata(const MasteringMetadata& mastering_metadata) {
uint64 Colour::PayloadSize() const { uint64 Colour::PayloadSize() const {
uint64 size = 0; uint64 size = 0;
if (matrix_coefficients != kUnspecifiedColourValue) if (matrix_coefficients != kValueNotPresent)
size += EbmlElementSize(kMkvMatrixCoefficients, matrix_coefficients); size += EbmlElementSize(kMkvMatrixCoefficients, matrix_coefficients);
if (bits_per_channel != kUnspecifiedColourValue) if (bits_per_channel != kValueNotPresent)
size += EbmlElementSize(kMkvBitsPerChannel, bits_per_channel); size += EbmlElementSize(kMkvBitsPerChannel, bits_per_channel);
if (chroma_subsampling_horz != kUnspecifiedColourValue) if (chroma_subsampling_horz != kValueNotPresent)
size += EbmlElementSize(kMkvChromaSubsamplingHorz, chroma_subsampling_horz); size += EbmlElementSize(kMkvChromaSubsamplingHorz, chroma_subsampling_horz);
if (chroma_subsampling_vert != kUnspecifiedColourValue) if (chroma_subsampling_vert != kValueNotPresent)
size += EbmlElementSize(kMkvChromaSubsamplingVert, chroma_subsampling_vert); size += EbmlElementSize(kMkvChromaSubsamplingVert, chroma_subsampling_vert);
if (cb_subsampling_horz != kUnspecifiedColourValue) if (cb_subsampling_horz != kValueNotPresent)
size += EbmlElementSize(kMkvCbSubsamplingHorz, cb_subsampling_horz); size += EbmlElementSize(kMkvCbSubsamplingHorz, cb_subsampling_horz);
if (cb_subsampling_vert != kUnspecifiedColourValue) if (cb_subsampling_vert != kValueNotPresent)
size += EbmlElementSize(kMkvCbSubsamplingVert, cb_subsampling_vert); size += EbmlElementSize(kMkvCbSubsamplingVert, cb_subsampling_vert);
if (chroma_siting_horz != kUnspecifiedColourValue) if (chroma_siting_horz != kValueNotPresent)
size += EbmlElementSize(kMkvChromaSitingHorz, chroma_siting_horz); size += EbmlElementSize(kMkvChromaSitingHorz, chroma_siting_horz);
if (chroma_siting_vert != kUnspecifiedColourValue) if (chroma_siting_vert != kValueNotPresent)
size += EbmlElementSize(kMkvChromaSitingVert, chroma_siting_vert); size += EbmlElementSize(kMkvChromaSitingVert, chroma_siting_vert);
if (range != kUnspecifiedColourValue) if (range != kValueNotPresent)
size += EbmlElementSize(kMkvRange, range); size += EbmlElementSize(kMkvRange, range);
if (transfer_characteristics != kUnspecifiedColourValue) if (transfer_characteristics != kValueNotPresent)
size += size +=
EbmlElementSize(kMkvTransferCharacteristics, transfer_characteristics); EbmlElementSize(kMkvTransferCharacteristics, transfer_characteristics);
if (primaries != kUnspecifiedColourValue) if (primaries != kValueNotPresent)
size += EbmlElementSize(kMkvPrimaries, primaries); size += EbmlElementSize(kMkvPrimaries, primaries);
if (max_cll != kUnspecifiedColourValue) if (max_cll != kValueNotPresent)
size += EbmlElementSize(kMkvMaxCLL, max_cll); size += EbmlElementSize(kMkvMaxCLL, max_cll);
if (max_fall != kUnspecifiedColourValue) if (max_fall != kValueNotPresent)
size += EbmlElementSize(kMkvMaxFALL, max_fall); size += EbmlElementSize(kMkvMaxFALL, max_fall);
if (mastering_metadata_) if (mastering_metadata_)

34
mkvmuxer.hpp
View File

@ -347,11 +347,11 @@ struct PrimaryChromaticity {
class MasteringMetadata { class MasteringMetadata {
public: public:
static const float kUnspecifiedMmValue; static const float kValueNotPresent;
MasteringMetadata() MasteringMetadata()
: luminance_max(kUnspecifiedMmValue), : luminance_max(kValueNotPresent),
luminance_min(kUnspecifiedMmValue), luminance_min(kValueNotPresent),
r_(NULL), r_(NULL),
g_(NULL), g_(NULL),
b_(NULL), b_(NULL),
@ -392,21 +392,21 @@ class MasteringMetadata {
class Colour { class Colour {
public: public:
static const uint64 kUnspecifiedColourValue; static const uint64 kValueNotPresent;
Colour() Colour()
: matrix_coefficients(kUnspecifiedColourValue), : matrix_coefficients(kValueNotPresent),
bits_per_channel(kUnspecifiedColourValue), bits_per_channel(kValueNotPresent),
chroma_subsampling_horz(kUnspecifiedColourValue), chroma_subsampling_horz(kValueNotPresent),
chroma_subsampling_vert(kUnspecifiedColourValue), chroma_subsampling_vert(kValueNotPresent),
cb_subsampling_horz(kUnspecifiedColourValue), cb_subsampling_horz(kValueNotPresent),
cb_subsampling_vert(kUnspecifiedColourValue), cb_subsampling_vert(kValueNotPresent),
chroma_siting_horz(kUnspecifiedColourValue), chroma_siting_horz(kValueNotPresent),
chroma_siting_vert(kUnspecifiedColourValue), chroma_siting_vert(kValueNotPresent),
range(kUnspecifiedColourValue), range(kValueNotPresent),
transfer_characteristics(kUnspecifiedColourValue), transfer_characteristics(kValueNotPresent),
primaries(kUnspecifiedColourValue), primaries(kValueNotPresent),
max_cll(kUnspecifiedColourValue), max_cll(kValueNotPresent),
max_fall(kUnspecifiedColourValue), max_fall(kValueNotPresent),
mastering_metadata_(NULL) {} mastering_metadata_(NULL) {}
~Colour() { delete mastering_metadata_; } ~Colour() { delete mastering_metadata_; }