| Index: content/common/gpu/media/dxva_video_decode_accelerator.cc
|
| diff --git a/content/common/gpu/media/dxva_video_decode_accelerator.cc b/content/common/gpu/media/dxva_video_decode_accelerator.cc
|
| index 33ac9a775a47402e6d4cc2b21fd79cf097cbcbe1..61824c3faf0ce506a4d16b8e103c36dc1208f005 100644
|
| --- a/content/common/gpu/media/dxva_video_decode_accelerator.cc
|
| +++ b/content/common/gpu/media/dxva_video_decode_accelerator.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";
|
| + 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(),
|
|
|