Refactoring of media::HDRMetadata struct

media/formats/webm/webm_colour_parser.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/formats/webm/webm_colour_parser.h"
 
 #include "base/logging.h"
 #include "media/formats/webm/webm_constants.h"
 
 namespace media {
@@ skipping 245 matching lines @@
 
 WebMColorMetadata::WebMColorMetadata() {}
 WebMColorMetadata::WebMColorMetadata(const WebMColorMetadata& rhs) = default;
 
 WebMMasteringMetadataParser::WebMMasteringMetadataParser() {}
 WebMMasteringMetadataParser::~WebMMasteringMetadataParser() {}
 
 bool WebMMasteringMetadataParser::OnFloat(int id, double val) {
   switch (id) {
     case kWebMIdPrimaryRChromaticityX:
-      mastering_metadata_.primary_r_chromaticity_x = val;
+      mastering_metadata_.primary_r_chromaticity.set_x(val);
       break;
     case kWebMIdPrimaryRChromaticityY:
-      mastering_metadata_.primary_r_chromaticity_y = val;
+      mastering_metadata_.primary_r_chromaticity.set_y(val);
       break;
     case kWebMIdPrimaryGChromaticityX:
-      mastering_metadata_.primary_g_chromaticity_x = val;
+      mastering_metadata_.primary_g_chromaticity.set_x(val);
       break;
     case kWebMIdPrimaryGChromaticityY:
-      mastering_metadata_.primary_g_chromaticity_y = val;
+      mastering_metadata_.primary_g_chromaticity.set_y(val);
       break;
     case kWebMIdPrimaryBChromaticityX:
-      mastering_metadata_.primary_b_chromaticity_x = val;
+      mastering_metadata_.primary_b_chromaticity.set_x(val);
       break;
     case kWebMIdPrimaryBChromaticityY:
-      mastering_metadata_.primary_b_chromaticity_y = val;
+      mastering_metadata_.primary_b_chromaticity.set_y(val);
       break;
     case kWebMIdWhitePointChromaticityX:
-      mastering_metadata_.white_point_chromaticity_x = val;
+      mastering_metadata_.white_point_chromaticity.set_x(val);
       break;
     case kWebMIdWhitePointChromaticityY:
-      mastering_metadata_.white_point_chromaticity_y = val;
+      mastering_metadata_.white_point_chromaticity.set_y(val);
       break;
     case kWebMIdLuminanceMax:
       mastering_metadata_.luminance_max = val;
       break;
     case kWebMIdLuminanceMin:
       mastering_metadata_.luminance_min = val;
       break;
     default:
       DVLOG(1) << "Unexpected id in MasteringMetadata: 0x" << std::hex << id;
       return false;
@@ skipping 12 matching lines @@
   bits_per_channel_ = -1;
   chroma_subsampling_horz_ = -1;
   chroma_subsampling_vert_ = -1;
   cb_subsampling_horz_ = -1;
   cb_subsampling_vert_ = -1;
   chroma_siting_horz_ = -1;
   chroma_siting_vert_ = -1;
   range_ = -1;
   transfer_characteristics_ = -1;
   primaries_ = -1;
-  max_cll_ = -1;
-  max_fall_ = -1;
+  max_content_light_level_ = -1;
+  max_frame_average_light_level_ = -1;
 }
 
 WebMParserClient* WebMColourParser::OnListStart(int id) {
   if (id == kWebMIdMasteringMetadata) {
     mastering_metadata_parsed_ = false;
     return &mastering_metadata_parser_;
   }
 
   return this;
 }
@@ skipping 35 matching lines @@
     case kWebMIdRange:
       dst = &range_;
       break;
     case kWebMIdTransferCharacteristics:
       dst = &transfer_characteristics_;
       break;
     case kWebMIdPrimaries:
       dst = &primaries_;
       break;
     case kWebMIdMaxCLL:
-      dst = &max_cll_;
+      dst = &max_content_light_level_;
       break;
     case kWebMIdMaxFALL:
-      dst = &max_fall_;
+      dst = &max_frame_average_light_level_;
       break;
     default:
       return true;
   }
 
   DCHECK(dst);
   if (*dst != -1) {
     LOG(ERROR) << "Multiple values for id " << std::hex << id << " specified ("
                << *dst << " and " << val << ")";
     return false;
@@ skipping 33 matching lines @@
     case Range::kFull:
       range_id = gfx::ColorSpace::RangeID::FULL;
       break;
     case Range::kDerived:
       range_id = gfx::ColorSpace::RangeID::DERIVED;
       break;
   }
   color_metadata.color_space = VideoColorSpace(
       primaries_, transfer_characteristics_, matrix_coefficients_, range_id);
 
-  if (max_cll_ != -1)
-    color_metadata.hdr_metadata.max_cll = max_cll_;
+  if (max_content_light_level_ != -1)
+    color_metadata.hdr_metadata.max_content_light_level =
+        max_content_light_level_;
 
-  if (max_fall_ != -1)
-    color_metadata.hdr_metadata.max_fall = max_fall_;
+  if (max_frame_average_light_level_ != -1)
+    color_metadata.hdr_metadata.max_frame_average_light_level =
+        max_frame_average_light_level_;
 
   if (mastering_metadata_parsed_)
     color_metadata.hdr_metadata.mastering_metadata =
         mastering_metadata_parser_.GetMasteringMetadata();
 
   return color_metadata;
 }
 
 }  // namespace media