Passed is_encrypted parameter to the VDA initialization.

content/common/gpu/media/dxva_video_decode_accelerator_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/media/dxva_video_decode_accelerator_win.h"
 
 #if !defined(OS_WIN)
 #error This file should only be built on Windows.
 #endif   // !defined(OS_WIN)
 
@@ skipping 614 matching lines @@
       weak_this_factory_(this) {
   weak_ptr_ = weak_this_factory_.GetWeakPtr();
   memset(&input_stream_info_, 0, sizeof(input_stream_info_));
   memset(&output_stream_info_, 0, sizeof(output_stream_info_));
 }
 
 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 we are falling back to
software decoder in these cases? Would this be a normal case or a result of a
bug to call this with is_encrypted=true? If the latter, would we know if VDA
supported encrypted content before attempting to Initialize() in order to avoid
calling it?

[xhwang, 2015/12/04 01:11:50]

Currently we are only initializing VDA on Android for encrypted stream. This is
to prevent unnecessary delay and complexity on other platforms. We can always
change this in the future when we have more VDA supporting encrypted streams.

https://code.google.com/p/chromium/codesearch#chromium/src/media/filters/gpu_...

+    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;
     }
   }
   if (!profile_supported) {
     RETURN_AND_NOTIFY_ON_FAILURE(false,
         "Unsupported h.264, vp8, or vp9 profile", PLATFORM_FAILURE, false);
   }
 
   // Not all versions of Windows 7 and later include Media Foundation DLLs.
@@ skipping 31 matching lines @@
       "EGL_ANGLE_surface_d3d_texture_2d_share_handle unavailable",
       PLATFORM_FAILURE,
       false);
 
   State state = GetState();
   RETURN_AND_NOTIFY_ON_FAILURE((state == kUninitialized),
       "Initialize: invalid state: " << state, ILLEGAL_STATE, false);
 
   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(),
       "Failed to get input/output stream info.", PLATFORM_FAILURE, false);
 
   RETURN_AND_NOTIFY_ON_FAILURE(
       SendMFTMessage(MFT_MESSAGE_NOTIFY_BEGIN_STREAMING, 0),
       "Send MFT_MESSAGE_NOTIFY_BEGIN_STREAMING notification failed",
       PLATFORM_FAILURE, false);
 
@@ skipping 1578 matching lines @@
     D3DSURFACE_DESC surface_desc;
     hr = surface->GetDesc(&surface_desc);
     RETURN_ON_HR_FAILURE(hr, "Failed to get surface description", false);
     *width = surface_desc.Width;
     *height = surface_desc.Height;
   }
   return true;
 }
 
 }  // namespace content