Implement Mojo IPC for media::HDRMetadata

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 68 matching lines @@
 
   [Native]
   enum RangeID;
 
   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;
+  float luminance_max;
+  float luminance_min;
+};
+
+struct HDRMetadata {
+  MasteringMetadata mastering_metadata;
+  uint32 max_cll;

[xhwang, 2017/04/07 16:24:47]

+hubbe:

I have no idea what "cll" is and what "fall" means. Could you please add some
reference in media/base/hdr_metadata.h?

[servolk, 2017/04/07 16:30:37]

Yeah, sorry about that, it's HDR jargon. I've added a couple of comments to
explain those values in hdr_metadata.h.

[hubbe, 2017/04/07 17:24:22]

Renaming the variables would be better.

+  uint32 max_fall;
+};
+
 // 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;
   mojo.common.mojom.TimeDelta seek_preroll;
   int32 codec_delay;
   EncryptionScheme encryption_scheme;
 };
 
 // This defines a mojo transport format for media::VideoDecoderConfig.
 // See media/base/video_decoder_config.h for descriptions.
 struct VideoDecoderConfig {
   VideoCodec codec;
   VideoCodecProfile profile;
   VideoPixelFormat format;
   ColorSpace color_space;
   gfx.mojom.Size coded_size;
   gfx.mojom.Rect visible_rect;
   gfx.mojom.Size natural_size;
   array<uint8> extra_data;
   EncryptionScheme encryption_scheme;
   VideoColorSpace color_space_info;
+  HDRMetadata? hdr_metadata;
 };
 
 // Native struct media::SubsampleEntry;
 [Native]
 struct SubsampleEntry;
 
 // This defines a mojo transport format for media::DecryptConfig.
 // See media/base/decrypt_config.h for descriptions.
 struct DecryptConfig {
   string key_id;
@@ skipping 108 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;
 };