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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 // static | 226 // static |
227 VideoConfig DecoderConfigAdapter::ToCastVideoConfig( | 227 VideoConfig DecoderConfigAdapter::ToCastVideoConfig( |
228 StreamId id, | 228 StreamId id, |
229 const ::media::VideoDecoderConfig& config) { | 229 const ::media::VideoDecoderConfig& config) { |
230 VideoConfig video_config; | 230 VideoConfig video_config; |
231 if (!config.IsValidConfig()) { | 231 if (!config.IsValidConfig()) { |
232 return video_config; | 232 return video_config; |
233 } | 233 } |
234 | 234 |
235 video_config.id = id; | 235 video_config.id = id; |
236 video_config.codec = ToCastVideoCodec(config.codec()); | 236 video_config.codec = ToCastVideoCodec(config.codec(), config.profile()); |
237 video_config.profile = ToCastVideoProfile(config.profile()); | 237 video_config.profile = ToCastVideoProfile(config.profile()); |
238 video_config.extra_data = config.extra_data(); | 238 video_config.extra_data = config.extra_data(); |
239 video_config.encryption_scheme = ToEncryptionScheme( | 239 video_config.encryption_scheme = ToEncryptionScheme( |
240 config.encryption_scheme()); | 240 config.encryption_scheme()); |
241 | 241 |
242 // TODO(servolk): gfx::ColorSpace currently doesn't provide getters for color | 242 // TODO(servolk): gfx::ColorSpace currently doesn't provide getters for color |
243 // space components. We'll need to way to fix this. crbug.com/649758 | 243 // space components. We'll need to way to fix this. crbug.com/649758 |
244 // video_config.primaries = | 244 // video_config.primaries = |
245 // static_cast<PrimaryID>(config.color_space_info().primaries()); | 245 // static_cast<PrimaryID>(config.color_space_info().primaries()); |
246 // video_config.transfer = | 246 // video_config.transfer = |
(...skipping 21 matching lines...) Expand all Loading... |
268 mm2.white_point_chromaticity_y = mm1.white_point_chromaticity_y; | 268 mm2.white_point_chromaticity_y = mm1.white_point_chromaticity_y; |
269 mm2.luminance_max = mm1.luminance_max; | 269 mm2.luminance_max = mm1.luminance_max; |
270 mm2.luminance_min = mm1.luminance_min; | 270 mm2.luminance_min = mm1.luminance_min; |
271 } | 271 } |
272 | 272 |
273 return video_config; | 273 return video_config; |
274 } | 274 } |
275 | 275 |
276 } // namespace media | 276 } // namespace media |
277 } // namespace chromecast | 277 } // namespace chromecast |
OLD | NEW |