Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Side by Side Diff: media/mojo/interfaces/hdr_metadata_struct_traits.h

Issue 2803563007: Refactoring of media::HDRMetadata struct (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_MOJO_INTERFACES_HDR_METADATA_STRUCT_TRAITS_H_ 5 #ifndef MEDIA_MOJO_INTERFACES_HDR_METADATA_STRUCT_TRAITS_H_
6 #define MEDIA_MOJO_INTERFACES_HDR_METADATA_STRUCT_TRAITS_H_ 6 #define MEDIA_MOJO_INTERFACES_HDR_METADATA_STRUCT_TRAITS_H_
7 7
8 #include "media/base/hdr_metadata.h" 8 #include "media/base/hdr_metadata.h"
9 #include "media/mojo/interfaces/media_types.mojom.h" 9 #include "media/mojo/interfaces/media_types.mojom.h"
10 10
11 namespace mojo { 11 namespace mojo {
12 12
13 template <> 13 template <>
14 struct StructTraits<media::mojom::MasteringMetadataDataView, 14 struct StructTraits<media::mojom::MasteringMetadataDataView,
15 media::MasteringMetadata> { 15 media::MasteringMetadata> {
16 static float primary_r_chromaticity_x(const media::MasteringMetadata& input) { 16 static gfx::PointF primary_r_chromaticity(
17 return input.primary_r_chromaticity_x; 17 const media::MasteringMetadata& input) {
18 return input.primary_r_chromaticity;
18 } 19 }
19 static float primary_r_chromaticity_y(const media::MasteringMetadata& input) { 20 static gfx::PointF primary_g_chromaticity(
20 return input.primary_r_chromaticity_y; 21 const media::MasteringMetadata& input) {
22 return input.primary_g_chromaticity;
21 } 23 }
22 static float primary_g_chromaticity_x(const media::MasteringMetadata& input) { 24 static gfx::PointF primary_b_chromaticity(
23 return input.primary_g_chromaticity_x; 25 const media::MasteringMetadata& input) {
26 return input.primary_b_chromaticity;
24 } 27 }
25 static float primary_g_chromaticity_y(const media::MasteringMetadata& input) { 28 static gfx::PointF white_point_chromaticity(
26 return input.primary_g_chromaticity_y; 29 const media::MasteringMetadata& input) {
27 } 30 return input.white_point_chromaticity;
28 static float primary_b_chromaticity_x(const media::MasteringMetadata& input) {
29 return input.primary_b_chromaticity_x;
30 }
31 static float primary_b_chromaticity_y(const media::MasteringMetadata& input) {
32 return input.primary_b_chromaticity_y;
33 }
34 static float white_point_chromaticity_x(const media::MasteringMetadata& inp) {
35 return inp.white_point_chromaticity_x;
36 }
37 static float white_point_chromaticity_y(const media::MasteringMetadata& inp) {
38 return inp.white_point_chromaticity_y;
39 } 31 }
40 static float luminance_max(const media::MasteringMetadata& input) { 32 static float luminance_max(const media::MasteringMetadata& input) {
41 return input.luminance_max; 33 return input.luminance_max;
42 } 34 }
43 static float luminance_min(const media::MasteringMetadata& input) { 35 static float luminance_min(const media::MasteringMetadata& input) {
44 return input.luminance_min; 36 return input.luminance_min;
45 } 37 }
46 38
47 static bool Read(media::mojom::MasteringMetadataDataView data, 39 static bool Read(media::mojom::MasteringMetadataDataView data,
48 media::MasteringMetadata* output) { 40 media::MasteringMetadata* output) {
49 output->primary_r_chromaticity_x = data.primary_r_chromaticity_x();
50 output->primary_r_chromaticity_y = data.primary_r_chromaticity_y();
51 output->primary_g_chromaticity_x = data.primary_g_chromaticity_x();
52 output->primary_g_chromaticity_y = data.primary_g_chromaticity_y();
53 output->primary_b_chromaticity_x = data.primary_b_chromaticity_x();
54 output->primary_b_chromaticity_y = data.primary_b_chromaticity_y();
55 output->white_point_chromaticity_x = data.white_point_chromaticity_x();
56 output->white_point_chromaticity_y = data.white_point_chromaticity_y();
57 output->luminance_max = data.luminance_max(); 41 output->luminance_max = data.luminance_max();
58 output->luminance_min = data.luminance_min(); 42 output->luminance_min = data.luminance_min();
59 return true; 43 return true;
60 } 44 }
61 }; 45 };
62 46
63 template <> 47 template <>
64 struct StructTraits<media::mojom::HDRMetadataDataView, media::HDRMetadata> { 48 struct StructTraits<media::mojom::HDRMetadataDataView, media::HDRMetadata> {
65 static unsigned max_cll(const media::HDRMetadata& input) { 49 static unsigned max_content_light_level(const media::HDRMetadata& input) {
66 return input.max_cll; 50 return input.max_content_light_level;
67 } 51 }
68 static unsigned max_fall(const media::HDRMetadata& input) { 52 static unsigned max_frame_average_light_level(
69 return input.max_fall; 53 const media::HDRMetadata& input) {
54 return input.max_frame_average_light_level;
70 } 55 }
71 static media::MasteringMetadata mastering_metadata( 56 static media::MasteringMetadata mastering_metadata(
72 const media::HDRMetadata& input) { 57 const media::HDRMetadata& input) {
73 return input.mastering_metadata; 58 return input.mastering_metadata;
74 } 59 }
75 60
76 static bool Read(media::mojom::HDRMetadataDataView data, 61 static bool Read(media::mojom::HDRMetadataDataView data,
77 media::HDRMetadata* output) { 62 media::HDRMetadata* output) {
78 output->max_cll = data.max_cll(); 63 output->max_content_light_level = data.max_content_light_level();
79 output->max_fall = data.max_fall(); 64 output->max_frame_average_light_level =
65 data.max_frame_average_light_level();
80 return true; 66 return true;
81 } 67 }
82 }; 68 };
83 69
84 } // namespace mojo 70 } // namespace mojo
85 71
86 #endif // MEDIA_MOJO_INTERFACES_HDR_METADATA_STRUCT_TRAITS_H_ 72 #endif // MEDIA_MOJO_INTERFACES_HDR_METADATA_STRUCT_TRAITS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698