Refactoring of media::HDRMetadata struct

media/formats/webm/webm_stream_parser_unittest.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_stream_parser.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "media/base/decoder_buffer.h"
@@ skipping 159 matching lines @@
       media_tracks_->getVideoConfig(video_track->bytestream_track_id());
 
   VideoColorSpace expected_color_space(VideoColorSpace::PrimaryID::SMPTEST428_1,
                                        VideoColorSpace::TransferID::LOG,
                                        VideoColorSpace::MatrixID::RGB,
                                        gfx::ColorSpace::RangeID::FULL);
   EXPECT_EQ(video_config.color_space_info(), expected_color_space);
 
   base::Optional<HDRMetadata> hdr_metadata = video_config.hdr_metadata();
   EXPECT_TRUE(hdr_metadata.has_value());
-  EXPECT_EQ(hdr_metadata->max_cll, 11u);
-  EXPECT_EQ(hdr_metadata->max_fall, 12u);
+  EXPECT_EQ(hdr_metadata->max_content_light_level, 11u);
+  EXPECT_EQ(hdr_metadata->max_frame_average_light_level, 12u);
 
   const MasteringMetadata& mmdata = hdr_metadata->mastering_metadata;
-  EXPECT_FLOAT_EQ(mmdata.primary_r_chromaticity_x, 0.1f);
-  EXPECT_FLOAT_EQ(mmdata.primary_r_chromaticity_y, 0.2f);
-  EXPECT_FLOAT_EQ(mmdata.primary_g_chromaticity_x, 0.1f);
-  EXPECT_FLOAT_EQ(mmdata.primary_g_chromaticity_y, 0.2f);
-  EXPECT_FLOAT_EQ(mmdata.primary_b_chromaticity_x, 0.1f);
-  EXPECT_FLOAT_EQ(mmdata.primary_b_chromaticity_y, 0.2f);
-  EXPECT_FLOAT_EQ(mmdata.white_point_chromaticity_x, 0.1f);
-  EXPECT_FLOAT_EQ(mmdata.white_point_chromaticity_y, 0.2f);
+  EXPECT_FLOAT_EQ(mmdata.primary_r_chromaticity.x(), 0.1f);
+  EXPECT_FLOAT_EQ(mmdata.primary_r_chromaticity.y(), 0.2f);
+  EXPECT_FLOAT_EQ(mmdata.primary_g_chromaticity.x(), 0.1f);
+  EXPECT_FLOAT_EQ(mmdata.primary_g_chromaticity.y(), 0.2f);
+  EXPECT_FLOAT_EQ(mmdata.primary_b_chromaticity.x(), 0.1f);
+  EXPECT_FLOAT_EQ(mmdata.primary_b_chromaticity.y(), 0.2f);
+  EXPECT_FLOAT_EQ(mmdata.white_point_chromaticity.x(), 0.1f);
+  EXPECT_FLOAT_EQ(mmdata.white_point_chromaticity.y(), 0.2f);
   EXPECT_EQ(mmdata.luminance_max, 40);
   EXPECT_EQ(mmdata.luminance_min, 30);
 }
 
 }  // namespace media