Refactoring of media::HDRMetadata struct

chromecast/media/cma/base/decoder_config_adapter.cc

Index: chromecast/media/cma/base/decoder_config_adapter.cc
diff --git a/chromecast/media/cma/base/decoder_config_adapter.cc b/chromecast/media/cma/base/decoder_config_adapter.cc
index cf4fdee32b37f01f97351c720d60f2a7905ec09a..c69341c5aff7bc54a067473cb7b5dbe646cd7bd2 100644
--- a/chromecast/media/cma/base/decoder_config_adapter.cc
+++ b/chromecast/media/cma/base/decoder_config_adapter.cc
@@ -307,19 +307,21 @@ VideoConfig DecoderConfigAdapter::ToCastVideoConfig(
   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.x();
+    mm2.primary_r_chromaticity_y = mm1.primary_r.y();
+    mm2.primary_g_chromaticity_x = mm1.primary_g.x();
+    mm2.primary_g_chromaticity_y = mm1.primary_g.y();
+    mm2.primary_b_chromaticity_x = mm1.primary_b.x();
+    mm2.primary_b_chromaticity_y = mm1.primary_b.y();
+    mm2.white_point_chromaticity_x = mm1.white_point.x();
+    mm2.white_point_chromaticity_y = mm1.white_point.y();
     mm2.luminance_max = mm1.luminance_max;
     mm2.luminance_min = mm1.luminance_min;
   }