| 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 #ifndef CHROMECAST_PUBLIC_MEDIA_DECODER_CONFIG_H_ | 5 #ifndef CHROMECAST_PUBLIC_MEDIA_DECODER_CONFIG_H_ |
| 6 #define CHROMECAST_PUBLIC_MEDIA_DECODER_CONFIG_H_ | 6 #define CHROMECAST_PUBLIC_MEDIA_DECODER_CONFIG_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 | 280 |
| 281 // HDR metadata common for HDR10 and WebM/VP9-based HDR formats. | 281 // HDR metadata common for HDR10 and WebM/VP9-based HDR formats. |
| 282 struct HDRMetadata { | 282 struct HDRMetadata { |
| 283 MasteringMetadata mastering_metadata; | 283 MasteringMetadata mastering_metadata; |
| 284 unsigned max_cll = 0; | 284 unsigned max_cll = 0; |
| 285 unsigned max_fall = 0; | 285 unsigned max_fall = 0; |
| 286 | 286 |
| 287 HDRMetadata(); | 287 HDRMetadata(); |
| 288 HDRMetadata(const HDRMetadata& rhs); | 288 HDRMetadata(const HDRMetadata& rhs); |
| 289 }; | 289 }; |
| 290 |
| 291 inline MasteringMetadata::MasteringMetadata() {} |
| 292 inline MasteringMetadata::MasteringMetadata(const MasteringMetadata& rhs) = |
| 293 default; |
| 294 |
| 295 inline HDRMetadata::HDRMetadata() {} |
| 296 inline HDRMetadata::HDRMetadata(const HDRMetadata& rhs) = default; |
| 290 // ---- End copy/paste from media/base/hdr_metadata.h ---- | 297 // ---- End copy/paste from media/base/hdr_metadata.h ---- |
| 291 | 298 |
| 292 // TODO(erickung): Remove constructor once CMA backend implementation doesn't | 299 // TODO(erickung): Remove constructor once CMA backend implementation doesn't |
| 293 // create a new object to reset the configuration and use IsValidConfig() to | 300 // create a new object to reset the configuration and use IsValidConfig() to |
| 294 // determine if the configuration is still valid or not. | 301 // determine if the configuration is still valid or not. |
| 295 struct AudioConfig { | 302 struct AudioConfig { |
| 296 AudioConfig(); | 303 AudioConfig(); |
| 297 AudioConfig(const AudioConfig& other); | 304 AudioConfig(const AudioConfig& other); |
| 298 ~AudioConfig(); | 305 ~AudioConfig(); |
| 299 | 306 |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 396 inline bool IsValidConfig(const VideoConfig& config) { | 403 inline bool IsValidConfig(const VideoConfig& config) { |
| 397 return config.codec >= kVideoCodecMin && | 404 return config.codec >= kVideoCodecMin && |
| 398 config.codec <= kVideoCodecMax && | 405 config.codec <= kVideoCodecMax && |
| 399 config.codec != kVideoCodecUnknown; | 406 config.codec != kVideoCodecUnknown; |
| 400 } | 407 } |
| 401 | 408 |
| 402 } // namespace media | 409 } // namespace media |
| 403 } // namespace chromecast | 410 } // namespace chromecast |
| 404 | 411 |
| 405 #endif // CHROMECAST_PUBLIC_MEDIA_DECODER_CONFIG_H_ | 412 #endif // CHROMECAST_PUBLIC_MEDIA_DECODER_CONFIG_H_ |
| OLD | NEW |