OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "media/mojo/services/media_type_converters.h" | 5 #include "media/mojo/services/media_type_converters.h" |
6 | 6 |
7 #include "media/base/audio_decoder_config.h" | 7 #include "media/base/audio_decoder_config.h" |
8 #include "media/base/buffering_state.h" | 8 #include "media/base/buffering_state.h" |
9 #include "media/base/cdm_key_information.h" | 9 #include "media/base/cdm_key_information.h" |
10 #include "media/base/decoder_buffer.h" | 10 #include "media/base/decoder_buffer.h" |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::YV24, VIDEO_FORMAT_YV24); | 136 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::YV24, VIDEO_FORMAT_YV24); |
137 #if defined(OS_MACOSX) | 137 #if defined(OS_MACOSX) |
138 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::NV12, VIDEO_FORMAT_NV12); | 138 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::NV12, VIDEO_FORMAT_NV12); |
139 #endif | 139 #endif |
140 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::ARGB, VIDEO_FORMAT_ARGB); | 140 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::ARGB, VIDEO_FORMAT_ARGB); |
141 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::XRGB, VIDEO_FORMAT_XRGB); | 141 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::XRGB, VIDEO_FORMAT_XRGB); |
142 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, | 142 ASSERT_ENUM_EQ_RAW(VideoFrame::Format, |
143 VideoFrame::FORMAT_MAX, | 143 VideoFrame::FORMAT_MAX, |
144 VIDEO_FORMAT_FORMAT_MAX); | 144 VIDEO_FORMAT_FORMAT_MAX); |
145 | 145 |
| 146 // ColorSpace. |
| 147 ASSERT_ENUM_EQ_RAW(VideoFrame::ColorSpace, |
| 148 VideoFrame::COLOR_SPACE_UNSPECIFIED, |
| 149 COLOR_SPACE_UNSPECIFIED); |
| 150 ASSERT_ENUM_EQ_RAW(VideoFrame::ColorSpace, |
| 151 VideoFrame::COLOR_SPACE_JPEG, |
| 152 COLOR_SPACE_JPEG); |
| 153 ASSERT_ENUM_EQ_RAW(VideoFrame::ColorSpace, |
| 154 VideoFrame::COLOR_SPACE_HD_REC709, |
| 155 COLOR_SPACE_HD_REC709); |
| 156 ASSERT_ENUM_EQ_RAW(VideoFrame::ColorSpace, |
| 157 VideoFrame::COLOR_SPACE_SD_REC601, |
| 158 COLOR_SPACE_SD_REC601); |
| 159 ASSERT_ENUM_EQ_RAW(VideoFrame::ColorSpace, |
| 160 VideoFrame::COLOR_SPACE_MAX, |
| 161 COLOR_SPACE_MAX); |
| 162 |
146 // VideoCodec | 163 // VideoCodec |
147 ASSERT_ENUM_EQ_RAW(VideoCodec, kUnknownVideoCodec, VIDEO_CODEC_UNKNOWN); | 164 ASSERT_ENUM_EQ_RAW(VideoCodec, kUnknownVideoCodec, VIDEO_CODEC_UNKNOWN); |
148 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, H264); | 165 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, H264); |
149 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, VC1); | 166 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, VC1); |
150 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, MPEG2); | 167 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, MPEG2); |
151 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, MPEG4); | 168 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, MPEG4); |
152 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, Theora); | 169 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, Theora); |
153 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, VP8); | 170 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, VP8); |
154 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, VP9); | 171 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, VP9); |
155 ASSERT_ENUM_EQ_RAW(VideoCodec, kVideoCodecMax, VIDEO_CODEC_Max); | 172 ASSERT_ENUM_EQ_RAW(VideoCodec, kVideoCodecMax, VIDEO_CODEC_Max); |
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
419 } | 436 } |
420 | 437 |
421 // static | 438 // static |
422 VideoDecoderConfigPtr | 439 VideoDecoderConfigPtr |
423 TypeConverter<VideoDecoderConfigPtr, media::VideoDecoderConfig>::Convert( | 440 TypeConverter<VideoDecoderConfigPtr, media::VideoDecoderConfig>::Convert( |
424 const media::VideoDecoderConfig& input) { | 441 const media::VideoDecoderConfig& input) { |
425 VideoDecoderConfigPtr config(VideoDecoderConfig::New()); | 442 VideoDecoderConfigPtr config(VideoDecoderConfig::New()); |
426 config->codec = static_cast<VideoCodec>(input.codec()); | 443 config->codec = static_cast<VideoCodec>(input.codec()); |
427 config->profile = static_cast<VideoCodecProfile>(input.profile()); | 444 config->profile = static_cast<VideoCodecProfile>(input.profile()); |
428 config->format = static_cast<VideoFormat>(input.format()); | 445 config->format = static_cast<VideoFormat>(input.format()); |
| 446 config->color_space = static_cast<ColorSpace>(input.color_space()); |
429 config->coded_size = Size::From(input.coded_size()); | 447 config->coded_size = Size::From(input.coded_size()); |
430 config->visible_rect = Rect::From(input.visible_rect()); | 448 config->visible_rect = Rect::From(input.visible_rect()); |
431 config->natural_size = Size::From(input.natural_size()); | 449 config->natural_size = Size::From(input.natural_size()); |
432 if (input.extra_data()) { | 450 if (input.extra_data()) { |
433 std::vector<uint8_t> data(input.extra_data(), | 451 std::vector<uint8_t> data(input.extra_data(), |
434 input.extra_data() + input.extra_data_size()); | 452 input.extra_data() + input.extra_data_size()); |
435 config->extra_data.Swap(&data); | 453 config->extra_data.Swap(&data); |
436 } | 454 } |
437 config->is_encrypted = input.is_encrypted(); | 455 config->is_encrypted = input.is_encrypted(); |
438 return config.Pass(); | 456 return config.Pass(); |
439 } | 457 } |
440 | 458 |
441 // static | 459 // static |
442 media::VideoDecoderConfig | 460 media::VideoDecoderConfig |
443 TypeConverter<media::VideoDecoderConfig, VideoDecoderConfigPtr>::Convert( | 461 TypeConverter<media::VideoDecoderConfig, VideoDecoderConfigPtr>::Convert( |
444 const VideoDecoderConfigPtr& input) { | 462 const VideoDecoderConfigPtr& input) { |
445 media::VideoDecoderConfig config; | 463 media::VideoDecoderConfig config; |
446 config.Initialize( | 464 config.Initialize( |
447 static_cast<media::VideoCodec>(input->codec), | 465 static_cast<media::VideoCodec>(input->codec), |
448 static_cast<media::VideoCodecProfile>(input->profile), | 466 static_cast<media::VideoCodecProfile>(input->profile), |
449 static_cast<media::VideoFrame::Format>(input->format), | 467 static_cast<media::VideoFrame::Format>(input->format), |
450 media::VideoFrame::COLOR_SPACE_UNSPECIFIED, | 468 static_cast<media::VideoFrame::ColorSpace>(input->color_space), |
451 input->coded_size.To<gfx::Size>(), | 469 input->coded_size.To<gfx::Size>(), |
452 input->visible_rect.To<gfx::Rect>(), | 470 input->visible_rect.To<gfx::Rect>(), |
453 input->natural_size.To<gfx::Size>(), | 471 input->natural_size.To<gfx::Size>(), |
454 input->extra_data.size() ? &input->extra_data.front() : NULL, | 472 input->extra_data.size() ? &input->extra_data.front() : NULL, |
455 input->extra_data.size(), | 473 input->extra_data.size(), |
456 input->is_encrypted, | 474 input->is_encrypted, |
457 false); | 475 false); |
458 return config; | 476 return config; |
459 } | 477 } |
460 | 478 |
(...skipping 15 matching lines...) Expand all Loading... |
476 CdmKeyInformationPtr>::Convert(const CdmKeyInformationPtr& input) { | 494 CdmKeyInformationPtr>::Convert(const CdmKeyInformationPtr& input) { |
477 scoped_ptr<media::CdmKeyInformation> info(new media::CdmKeyInformation); | 495 scoped_ptr<media::CdmKeyInformation> info(new media::CdmKeyInformation); |
478 info->key_id = input->key_id.storage(); | 496 info->key_id = input->key_id.storage(); |
479 info->status = | 497 info->status = |
480 static_cast<media::CdmKeyInformation::KeyStatus>(input->status); | 498 static_cast<media::CdmKeyInformation::KeyStatus>(input->status); |
481 info->system_code = input->system_code; | 499 info->system_code = input->system_code; |
482 return info.Pass(); | 500 return info.Pass(); |
483 } | 501 } |
484 | 502 |
485 } // namespace mojo | 503 } // namespace mojo |
OLD | NEW |