| Index: media/mojo/interfaces/hdr_metadata_struct_traits.h
|
| diff --git a/media/mojo/interfaces/hdr_metadata_struct_traits.h b/media/mojo/interfaces/hdr_metadata_struct_traits.h
|
| index 498f8302af355c558fb396ba52f853ee4ae65126..6ca3810ea499c6e081baf6be20679c5580985eeb 100644
|
| --- a/media/mojo/interfaces/hdr_metadata_struct_traits.h
|
| +++ b/media/mojo/interfaces/hdr_metadata_struct_traits.h
|
| @@ -36,6 +36,14 @@ struct StructTraits<media::mojom::MasteringMetadataDataView,
|
| media::MasteringMetadata* output) {
|
| output->luminance_max = data.luminance_max();
|
| output->luminance_min = data.luminance_min();
|
| + if (!data.ReadPrimaryR(&output->primary_r))
|
| + return false;
|
| + if (!data.ReadPrimaryG(&output->primary_g))
|
| + return false;
|
| + if (!data.ReadPrimaryB(&output->primary_b))
|
| + return false;
|
| + if (!data.ReadWhitePoint(&output->white_point))
|
| + return false;
|
| return true;
|
| }
|
| };
|
| @@ -59,6 +67,8 @@ struct StructTraits<media::mojom::HDRMetadataDataView, media::HDRMetadata> {
|
| output->max_content_light_level = data.max_content_light_level();
|
| output->max_frame_average_light_level =
|
| data.max_frame_average_light_level();
|
| + if (!data.ReadMasteringMetadata(&output->mastering_metadata))
|
| + return false;
|
| return true;
|
| }
|
| };
|
|
|