Refactoring of media::HDRMetadata struct

media/mojo/interfaces/media_types.mojom

 // Copyright 2014 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.
 
 module media.mojom;
 
 import "gpu/ipc/common/mailbox_holder.mojom";
 import "mojo/common/time.mojom";
 import "ui/gfx/geometry/mojo/geometry.mojom";
 
@@ skipping 71 matching lines @@
 
   PrimaryID primaries;
   TransferID transfer;
   MatrixID matrix;
   RangeID range;
 };
 
 // This defines a mojo transport format for media::HDRMetadata.
 // See media/base/hdr_metadata.h for description.
 struct MasteringMetadata {
-  float primary_r_chromaticity_x;
-  float primary_r_chromaticity_y;
-  float primary_g_chromaticity_x;
-  float primary_g_chromaticity_y;
-  float primary_b_chromaticity_x;
-  float primary_b_chromaticity_y;
-  float white_point_chromaticity_x;
-  float white_point_chromaticity_y;
+  gfx.mojom.PointF primary_r_chromaticity;
+  gfx.mojom.PointF primary_g_chromaticity;
+  gfx.mojom.PointF primary_b_chromaticity;
+  gfx.mojom.PointF white_point_chromaticity;
   float luminance_max;
   float luminance_min;
 };
 
 struct HDRMetadata {
   MasteringMetadata mastering_metadata;
-  uint32 max_cll;
-  uint32 max_fall;
+  uint32 max_content_light_level;
+  uint32 max_frame_average_light_level;
 };
 
 // This defines a mojo transport format for media::AudioDecoderConfig.
 // See media/base/audio_decoder_config.h for descriptions.
 struct AudioDecoderConfig {
   AudioCodec codec;
   SampleFormat sample_format;
   ChannelLayout channel_layout;
   int32 samples_per_second;
   array<uint8> extra_data;
@@ skipping 137 matching lines @@
 };
 
 struct PipelineStatistics {
   uint64 audio_bytes_decoded;
   uint64 video_bytes_decoded;
   uint32 video_frames_decoded;
   uint32 video_frames_dropped;
   int64 audio_memory_usage;
   int64 video_memory_usage;
 };