| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "chromecast/media/cma/base/decoder_config_adapter.h" | 5 #include "chromecast/media/cma/base/decoder_config_adapter.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "chromecast/media/base/media_codec_support.h" | 8 #include "chromecast/media/base/media_codec_support.h" |
| 9 #include "media/base/channel_layout.h" | 9 #include "media/base/channel_layout.h" |
| 10 | 10 |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 mm2.primary_b_chromaticity_y = mm1.primary_b_chromaticity_y; | 264 mm2.primary_b_chromaticity_y = mm1.primary_b_chromaticity_y; |
| 265 mm2.white_point_chromaticity_x = mm1.white_point_chromaticity_x; | 265 mm2.white_point_chromaticity_x = mm1.white_point_chromaticity_x; |
| 266 mm2.white_point_chromaticity_y = mm1.white_point_chromaticity_y; | 266 mm2.white_point_chromaticity_y = mm1.white_point_chromaticity_y; |
| 267 mm2.luminance_max = mm1.luminance_max; | 267 mm2.luminance_max = mm1.luminance_max; |
| 268 mm2.luminance_min = mm1.luminance_min; | 268 mm2.luminance_min = mm1.luminance_min; |
| 269 } | 269 } |
| 270 | 270 |
| 271 return video_config; | 271 return video_config; |
| 272 } | 272 } |
| 273 | 273 |
| 274 MasteringMetadata::MasteringMetadata() {} | |
| 275 MasteringMetadata::MasteringMetadata(const MasteringMetadata& rhs) = default; | |
| 276 | |
| 277 HDRMetadata::HDRMetadata() {} | |
| 278 HDRMetadata::HDRMetadata(const HDRMetadata& rhs) = default; | |
| 279 | |
| 280 // Ensure that Chromecast enum values match enums in gfx::ColorSpace. | 274 // Ensure that Chromecast enum values match enums in gfx::ColorSpace. |
| 281 #define STATIC_ASSERT_ENUM(a, b) \ | 275 #define STATIC_ASSERT_ENUM(a, b) \ |
| 282 static_assert(static_cast<int>(a) == static_cast<int>(gfx::ColorSpace::b), \ | 276 static_assert(static_cast<int>(a) == static_cast<int>(gfx::ColorSpace::b), \ |
| 283 "mismatching enums: " #a " and " #b) | 277 "mismatching enums: " #a " and " #b) |
| 284 | 278 |
| 285 STATIC_ASSERT_ENUM(PrimaryID::RESERVED0, PrimaryID::RESERVED0); | 279 STATIC_ASSERT_ENUM(PrimaryID::RESERVED0, PrimaryID::RESERVED0); |
| 286 STATIC_ASSERT_ENUM(PrimaryID::BT709, PrimaryID::BT709); | 280 STATIC_ASSERT_ENUM(PrimaryID::BT709, PrimaryID::BT709); |
| 287 STATIC_ASSERT_ENUM(PrimaryID::UNSPECIFIED, PrimaryID::UNSPECIFIED); | 281 STATIC_ASSERT_ENUM(PrimaryID::UNSPECIFIED, PrimaryID::UNSPECIFIED); |
| 288 STATIC_ASSERT_ENUM(PrimaryID::RESERVED, PrimaryID::RESERVED); | 282 STATIC_ASSERT_ENUM(PrimaryID::RESERVED, PrimaryID::RESERVED); |
| 289 STATIC_ASSERT_ENUM(PrimaryID::BT470M, PrimaryID::BT470M); | 283 STATIC_ASSERT_ENUM(PrimaryID::BT470M, PrimaryID::BT470M); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 STATIC_ASSERT_ENUM(MatrixID::BT2020_NCL, MatrixID::BT2020_NCL); | 323 STATIC_ASSERT_ENUM(MatrixID::BT2020_NCL, MatrixID::BT2020_NCL); |
| 330 STATIC_ASSERT_ENUM(MatrixID::BT2020_CL, MatrixID::BT2020_CL); | 324 STATIC_ASSERT_ENUM(MatrixID::BT2020_CL, MatrixID::BT2020_CL); |
| 331 | 325 |
| 332 STATIC_ASSERT_ENUM(RangeID::UNSPECIFIED, RangeID::UNSPECIFIED); | 326 STATIC_ASSERT_ENUM(RangeID::UNSPECIFIED, RangeID::UNSPECIFIED); |
| 333 STATIC_ASSERT_ENUM(RangeID::LIMITED, RangeID::LIMITED); | 327 STATIC_ASSERT_ENUM(RangeID::LIMITED, RangeID::LIMITED); |
| 334 STATIC_ASSERT_ENUM(RangeID::FULL, RangeID::FULL); | 328 STATIC_ASSERT_ENUM(RangeID::FULL, RangeID::FULL); |
| 335 STATIC_ASSERT_ENUM(RangeID::DERIVED, RangeID::DERIVED); | 329 STATIC_ASSERT_ENUM(RangeID::DERIVED, RangeID::DERIVED); |
| 336 | 330 |
| 337 } // namespace media | 331 } // namespace media |
| 338 } // namespace chromecast | 332 } // namespace chromecast |
| OLD | NEW |