Chromium Code Reviews| Index: content/common/gpu/media/dxva_video_decode_accelerator_win.cc |
| diff --git a/content/common/gpu/media/dxva_video_decode_accelerator_win.cc b/content/common/gpu/media/dxva_video_decode_accelerator_win.cc |
| index 22b8b33140565602165eb58dcaa600c60d3410c7..0e71f1e0e0e3a87ae3d17fd388766d676f9e5184 100644 |
| --- a/content/common/gpu/media/dxva_video_decode_accelerator_win.cc |
| +++ b/content/common/gpu/media/dxva_video_decode_accelerator_win.cc |
| @@ -632,15 +632,20 @@ DXVAVideoDecodeAccelerator::~DXVAVideoDecodeAccelerator() { |
| client_ = NULL; |
| } |
| -bool DXVAVideoDecodeAccelerator::Initialize(media::VideoCodecProfile profile, |
| - Client* client) { |
| +bool DXVAVideoDecodeAccelerator::Initialize(const Config& config, |
| + Client* client) { |
| + if (config.is_encrypted) { |
| + NOTREACHED() << "Encrypted streams are not supported for this VDA"; |
|
Pawel Osciak
2015/12/04 00:48:58
Should this be a NOTREACHED, or just a DVLOG() if
xhwang
2015/12/04 01:11:50
Currently we are only initializing VDA on Android
|
| + return false; |
| + } |
| + |
| client_ = client; |
| main_thread_task_runner_ = base::MessageLoop::current()->task_runner(); |
| bool profile_supported = false; |
| for (const auto& supported_profile : kSupportedProfiles) { |
| - if (profile == supported_profile) { |
| + if (config.profile == supported_profile) { |
| profile_supported = true; |
| break; |
| } |
| @@ -692,7 +697,7 @@ bool DXVAVideoDecodeAccelerator::Initialize(media::VideoCodecProfile profile, |
| media::InitializeMediaFoundation(); |
| - RETURN_AND_NOTIFY_ON_FAILURE(InitDecoder(profile), |
| + RETURN_AND_NOTIFY_ON_FAILURE(InitDecoder(config.profile), |
| "Failed to initialize decoder", PLATFORM_FAILURE, false); |
| RETURN_AND_NOTIFY_ON_FAILURE(GetStreamsInfoAndBufferReqs(), |