Refactoring of media::HDRMetadata struct

chromecast/media/cma/base/decoder_config_adapter.cc

 // Copyright 2015 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 "chromecast/media/cma/base/decoder_config_adapter.h"
 
 #include "base/logging.h"
 #include "chromecast/media/base/media_codec_support.h"
 #include "media/base/channel_layout.h"
 
@@ skipping 289 matching lines @@
   video_config.primaries =
       static_cast<PrimaryID>(config.color_space_info().primaries);
   video_config.transfer =
       static_cast<TransferID>(config.color_space_info().transfer);
   video_config.matrix = static_cast<MatrixID>(config.color_space_info().matrix);
   video_config.range = static_cast<RangeID>(config.color_space_info().range);
 
   base::Optional<::media::HDRMetadata> hdr_metadata = config.hdr_metadata();
   if (hdr_metadata) {
     video_config.have_hdr_metadata = true;
-    video_config.hdr_metadata.max_cll = hdr_metadata->max_cll;
-    video_config.hdr_metadata.max_fall = hdr_metadata->max_fall;
+    video_config.hdr_metadata.max_content_light_level =
+        hdr_metadata->max_content_light_level;
+    video_config.hdr_metadata.max_frame_average_light_level =
+        hdr_metadata->max_frame_average_light_level;
 
     const auto& mm1 = hdr_metadata->mastering_metadata;
     auto& mm2 = video_config.hdr_metadata.mastering_metadata;
-    mm2.primary_r_chromaticity_x = mm1.primary_r_chromaticity_x;
-    mm2.primary_r_chromaticity_y = mm1.primary_r_chromaticity_y;
-    mm2.primary_g_chromaticity_x = mm1.primary_g_chromaticity_x;
-    mm2.primary_g_chromaticity_y = mm1.primary_g_chromaticity_y;
-    mm2.primary_b_chromaticity_x = mm1.primary_b_chromaticity_x;
-    mm2.primary_b_chromaticity_y = mm1.primary_b_chromaticity_y;
-    mm2.white_point_chromaticity_x = mm1.white_point_chromaticity_x;
-    mm2.white_point_chromaticity_y = mm1.white_point_chromaticity_y;
+    mm2.primary_r_chromaticity_x = mm1.primary_r_chromaticity.x();
+    mm2.primary_r_chromaticity_y = mm1.primary_r_chromaticity.y();
+    mm2.primary_g_chromaticity_x = mm1.primary_g_chromaticity.x();
+    mm2.primary_g_chromaticity_y = mm1.primary_g_chromaticity.y();
+    mm2.primary_b_chromaticity_x = mm1.primary_b_chromaticity.x();
+    mm2.primary_b_chromaticity_y = mm1.primary_b_chromaticity.y();
+    mm2.white_point_chromaticity_x = mm1.white_point_chromaticity.x();
+    mm2.white_point_chromaticity_y = mm1.white_point_chromaticity.y();
     mm2.luminance_max = mm1.luminance_max;
     mm2.luminance_min = mm1.luminance_min;
   }
 
   return video_config;
 }
 
 }  // namespace media
 }  // namespace chromecast