Reenable idle suspension of media elements on Windows.

media/gpu/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 "media/gpu/dxva_video_decode_accelerator_win.h"
 
 #include <memory>
 
 #if !defined(OS_WIN)
 #error This file should only be built on Windows.
@@ skipping 468 matching lines @@
 }
 
 DXVAVideoDecodeAccelerator::PendingSampleInfo::PendingSampleInfo(
     const PendingSampleInfo& other) = default;
 
 DXVAVideoDecodeAccelerator::PendingSampleInfo::~PendingSampleInfo() {}
 
 DXVAVideoDecodeAccelerator::DXVAVideoDecodeAccelerator(
     const GetGLContextCallback& get_gl_context_cb,
     const MakeGLContextCurrentCallback& make_context_current_cb,
+    const BindGLImageCallback& bind_image_cb,
     const gpu::GpuDriverBugWorkarounds& workarounds,
     const gpu::GpuPreferences& gpu_preferences)
     : client_(NULL),
       dev_manager_reset_token_(0),
       dx11_dev_manager_reset_token_(0),
       egl_config_(NULL),
       state_(kUninitialized),
       pictures_requested_(false),
       inputs_before_decode_(0),
       sent_drain_message_(false),
       get_gl_context_cb_(get_gl_context_cb),
       make_context_current_cb_(make_context_current_cb),
+      bind_image_cb_(bind_image_cb),
       codec_(kUnknownVideoCodec),
       decoder_thread_("DXVAVideoDecoderThread"),
       pending_flush_(false),
       enable_low_latency_(gpu_preferences.enable_low_latency_dxva),
       share_nv12_textures_(gpu_preferences.enable_zero_copy_dxgi_video &&
                            !workarounds.disable_dxgi_zero_copy_video),
       copy_nv12_textures_(gpu_preferences.enable_nv12_dxgi_video &&
                           !workarounds.disable_nv12_dxgi_video),
       use_dx11_(false),
       use_keyed_mutex_(false),
@@ skipping 362 matching lines @@
       "Failed to provide requested picture buffers. (Got "
           << buffers.size() << ", requested " << kNumPictureBuffers << ")",
       INVALID_ARGUMENT, );
 
   RETURN_AND_NOTIFY_ON_FAILURE(make_context_current_cb_.Run(),
                                "Failed to make context current",
                                PLATFORM_FAILURE, );
   // Copy the picture buffers provided by the client to the available list,
   // and mark these buffers as available for use.
   for (size_t buffer_index = 0; buffer_index < buffers.size(); ++buffer_index) {
+    RETURN_AND_NOTIFY_ON_FAILURE(
+        buffers[buffer_index].service_texture_ids().size() ==
+            buffers[buffer_index].client_texture_ids().size(),
+        "Number of service and client ids do not match", PLATFORM_FAILURE, );

[sandersd (OOO until July 31), 2016/11/14 19:16:22]

Is this still correct for the vda unittest? At one point it was using the same
IDs for both, but there was a proposed CL to only send one of the lists. I don't
know what the end result was.

     linked_ptr<DXVAPictureBuffer> picture_buffer =
         DXVAPictureBuffer::Create(*this, buffers[buffer_index], egl_config_);
     RETURN_AND_NOTIFY_ON_FAILURE(picture_buffer.get(),
                                  "Failed to allocate picture buffer",
                                  PLATFORM_FAILURE, );
+    if (bind_image_cb_) {
+      for (size_t i = 0; i < buffers[buffer_index].client_texture_ids().size();
+           i++) {
+        bind_image_cb_.Run(buffers[buffer_index].client_texture_ids()[i],
+                           buffers[buffer_index].service_texture_ids()[i],

[sandersd (OOO until July 31), 2016/11/14 19:16:22]

The second parameter should be the texture target. I'm not sure what it should
be for these, but it's either GL_TEXTURE_EXTERNEL_OES or GL_TEXTURE_2D.

+                           picture_buffer->gl_image(), true);
+      }
+    }
 
     bool inserted =
         output_picture_buffers_
             .insert(std::make_pair(buffers[buffer_index].id(), picture_buffer))
             .second;
     DCHECK(inserted);
   }
 
   ProcessPendingSamples();
   if (pending_flush_ || processing_config_changed_) {
@@ skipping 1845 matching lines @@
   SetState(kConfigChange);
   Invalidate();
   Initialize(config_, client_);
   decoder_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&DXVAVideoDecodeAccelerator::DecodePendingInputBuffers,
                  base::Unretained(this)));
 }
 
 }  // namespace media