OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_BASE_HDR_METADATA_H_ | 5 #ifndef MEDIA_BASE_HDR_METADATA_H_ |
6 #define MEDIA_BASE_HDR_METADATA_H_ | 6 #define MEDIA_BASE_HDR_METADATA_H_ |
7 | 7 |
8 #include "media/base/media_export.h" | 8 #include "media/base/media_export.h" |
9 | 9 |
10 namespace media { | 10 namespace media { |
(...skipping 24 matching lines...) Expand all Loading... | |
35 (white_point_chromaticity_x == rhs.white_point_chromaticity_x) && | 35 (white_point_chromaticity_x == rhs.white_point_chromaticity_x) && |
36 (white_point_chromaticity_y == rhs.white_point_chromaticity_y) && | 36 (white_point_chromaticity_y == rhs.white_point_chromaticity_y) && |
37 (luminance_max == rhs.luminance_max) && | 37 (luminance_max == rhs.luminance_max) && |
38 (luminance_min == rhs.luminance_min)); | 38 (luminance_min == rhs.luminance_min)); |
39 } | 39 } |
40 }; | 40 }; |
41 | 41 |
42 // HDR metadata common for HDR10 and WebM/VP9-based HDR formats. | 42 // HDR metadata common for HDR10 and WebM/VP9-based HDR formats. |
43 struct MEDIA_EXPORT HDRMetadata { | 43 struct MEDIA_EXPORT HDRMetadata { |
44 MasteringMetadata mastering_metadata; | 44 MasteringMetadata mastering_metadata; |
45 // Max content light level (CLL), i.e. maximum brightness level present in the | |
46 // stream), in nits. | |
45 unsigned max_cll = 0; | 47 unsigned max_cll = 0; |
48 // Max frame-average light level (FALL), i.e. maximum average brightness of | |
49 // the brightest frame in the stream), in nits. | |
46 unsigned max_fall = 0; | 50 unsigned max_fall = 0; |
xhwang
2017/04/07 16:46:05
Thank you for adding the comments!
Per the style
| |
47 | 51 |
48 HDRMetadata(); | 52 HDRMetadata(); |
49 HDRMetadata(const HDRMetadata& rhs); | 53 HDRMetadata(const HDRMetadata& rhs); |
50 | 54 |
51 bool operator==(const HDRMetadata& rhs) const { | 55 bool operator==(const HDRMetadata& rhs) const { |
52 return ((max_cll == rhs.max_cll) && (max_fall == rhs.max_fall) && | 56 return ((max_cll == rhs.max_cll) && (max_fall == rhs.max_fall) && |
53 (mastering_metadata == rhs.mastering_metadata)); | 57 (mastering_metadata == rhs.mastering_metadata)); |
54 } | 58 } |
55 }; | 59 }; |
56 | 60 |
57 } // namespace media | 61 } // namespace media |
58 | 62 |
59 #endif // MEDIA_BASE_HDR_METADATA_H_ | 63 #endif // MEDIA_BASE_HDR_METADATA_H_ |
OLD | NEW |