vaapi plumbing to allow hardware video overlays

content/common/gpu/media/gpu_video_decode_accelerator.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/gpu_video_decode_accelerator.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 323 matching lines @@
         io_message_loop_));
   }
 #endif
   return decoder.Pass();
 }
 
 scoped_ptr<media::VideoDecodeAccelerator>
 GpuVideoDecodeAccelerator::CreateVaapiVDA() {
   scoped_ptr<media::VideoDecodeAccelerator> decoder;
 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
-  decoder.reset(new VaapiVideoDecodeAccelerator(make_context_current_));
+  gpu::gles2::GLES2Decoder* command_decoder = stub_->decoder();
+  gpu::gles2::TextureManager* texture_manager =
+      command_decoder->GetContextGroup()->texture_manager();
+  decoder.reset(
+      new VaapiVideoDecodeAccelerator(make_context_current_, texture_manager));
 #endif
   return decoder.Pass();
 }
 
 scoped_ptr<media::VideoDecodeAccelerator>
 GpuVideoDecodeAccelerator::CreateVTVDA() {
   scoped_ptr<media::VideoDecodeAccelerator> decoder;
 #if defined(OS_MACOSX)
   decoder.reset(new VTVideoDecodeAccelerator(
       static_cast<CGLContextObj>(stub_->decoder()->GetGLContext()->GetHandle()),
@@ skipping 107 matching lines @@
 
       // TODO(dshwang): after moving to D3D11, remove this. crbug.com/438691
       GLenum format =
           video_decode_accelerator_.get()->GetSurfaceInternalFormat();
       if (format != GL_RGBA) {
         texture_manager->SetLevelInfo(texture_ref, texture_target_, 0, format,
                                       width, height, 1, 0, format, 0, false);
       }
     }
     uint32 service_texture_id;
     if (!command_decoder->GetServiceTextureId(

[piman, 2015/01/21 23:58:22]

Unrelated to your patch, but this is not needed any more, since you already have
the TextureRef (the Texture, even). This would save a hash lookup.
GetServiceTextureId was introduced only for GVDA, it can be ripped out
completely.

[achaulk, 2015/01/22 18:13:47]

Done.

             texture_ids[i], &service_texture_id)) {
       DLOG(ERROR) << "Failed to translate texture!";
       NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
       return;
     }
-    buffers.push_back(media::PictureBuffer(
-        buffer_ids[i], texture_dimensions_, service_texture_id));
+    buffers.push_back(media::PictureBuffer(buffer_ids[i], texture_dimensions_,
+                                           service_texture_id, texture_ids[i]));

[Pawel Osciak, 2015/01/21 13:07:07]

Could you please explain the difference between service_texture_id and
texture_id ? Why do we need texture_id vs service_texture_id?

[achaulk, 2015/01/21 17:10:03]

texture_id[] is the client-side (browser) texture ID, while service_texture_id
is the real one that GL actually uses. We need texture_id[] to look up the
TextureRef later on, and service_texture_id to pass to GL to actually do the
binding, etc

[piman, 2015/01/21 23:58:22]

If you have the TextureRef, you can get the service_id() directly
(texture_ref->service_id()), so maybe you don't need to keep both ids?

[achaulk, 2015/01/22 18:13:47]

Yes, but if I pass only the client ID instead, all VDA implementations would
need to be changed and also have to know about gles stuff

     textures.push_back(texture_ref);
   }
   video_decode_accelerator_->AssignPictureBuffers(buffers);
   DebugAutoLock auto_lock(debug_uncleared_textures_lock_);
   for (uint32 i = 0; i < buffer_ids.size(); ++i)
     uncleared_textures_[buffer_ids[i]] = textures[i];
 }
 
 void GpuVideoDecodeAccelerator::OnReusePictureBuffer(
     int32 picture_buffer_id) {
@@ skipping 88 matching lines @@
   return stub_->channel()->Send(message);
 }
 
 void GpuVideoDecodeAccelerator::SendCreateDecoderReply(IPC::Message* message,
                                                        bool succeeded) {
   GpuCommandBufferMsg_CreateVideoDecoder::WriteReplyParams(message, succeeded);
   Send(message);
 }
 
 }  // namespace content