Add VAVDA, the VAAPI Video Decode Accelerator for Intel CPUs.

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/logging.h"
 #include "base/stl_util.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif  // OS_WIN
 
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/gpu_messages.h"
 
-#if (defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_WIN)
 #if defined(OS_WIN)
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
 #else  // OS_WIN

[Ami GONE FROM CHROMIUM, 2012/03/21 13:16:24]

Having #else\n#if is confusing; replace with #elif?

[Pawel Osciak, 2012/04/05 10:37:20]

Done.

+#if defined(ARCH_CPU_ARMEL)
 #include "content/common/gpu/media/omx_video_decode_accelerator.h"
+#elif defined(ARCH_CPU_X86_FAMILY)
+#include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
+#include "ui/gfx/gl/gl_context_glx.h"
+#include "ui/gfx/gl/gl_surface_glx.h"
+#endif // ARCH_CPU_ARMEL
+
+#include "ui/gfx/gl/gl_context.h"

[Ami GONE FROM CHROMIUM, 2012/03/21 13:16:24]

dup of l.40 below?

[Pawel Osciak, 2012/04/05 10:37:20]

Done.

+
 #endif  // OS_WIN
+
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_surface_egl.h"
-#endif
+#endif // OS_CHROMEOS || OS_WIN
 
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "ui/gfx/size.h"
 
 using gpu::gles2::TextureManager;
 
 GpuVideoDecodeAccelerator::GpuVideoDecodeAccelerator(
     IPC::Message::Sender* sender,
     int32 host_route_id,
     GpuCommandBufferStub* stub)
@@ skipping 73 matching lines @@
 
 void GpuVideoDecodeAccelerator::Initialize(
     const media::VideoDecodeAccelerator::Profile profile,
     IPC::Message* init_done_msg,
     base::ProcessHandle renderer_process) {
   DCHECK(!video_decode_accelerator_.get());
   DCHECK(!init_done_msg_);
   DCHECK(init_done_msg);
   init_done_msg_ = init_done_msg;
 
-#if (defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_WIN)
   DCHECK(stub_ && stub_->decoder());
 #if defined(OS_WIN)
   if (base::win::GetVersion() < base::win::VERSION_WIN7) {
     NOTIMPLEMENTED() << "HW video decode acceleration not available.";
     NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
     return;
   }
   DLOG(INFO) << "Initializing DXVA HW decoder for windows.";
   DXVAVideoDecodeAccelerator* video_decoder =
       new DXVAVideoDecodeAccelerator(this, renderer_process);
-#else  // OS_WIN
+#elif defined(OS_CHROMEOS)  // OS_WIN
+#if defined(ARCH_CPU_ARMEL)
   OmxVideoDecodeAccelerator* video_decoder =
       new OmxVideoDecodeAccelerator(this);
   video_decoder->SetEglState(
       gfx::GLSurfaceEGL::GetHardwareDisplay(),
       stub_->decoder()->GetGLContext()->GetHandle());
+#elif defined(ARCH_CPU_X86_FAMILY)
+  DLOG(INFO) << "Initializing VAAPI HW decoder.";

[Ami GONE FROM CHROMIUM, 2012/03/21 13:16:24]

drop

[Pawel Osciak, 2012/04/05 10:37:20]

Ok, although there is a similar print for DXVA a few lines above...

+  VaapiVideoDecodeAccelerator* video_decoder =
+      new VaapiVideoDecodeAccelerator(this);
+  gfx::GLContextGLX* glx_context =
+      (gfx::GLContextGLX*) stub_->decoder()->GetGLContext();

[Ami GONE FROM CHROMIUM, 2012/03/21 13:16:24]

Both this and the cast below should be static_cast<>'s

[Pawel Osciak, 2012/04/05 10:37:20]

Done.

+  Display* display = glx_context->GetDisplay();
+  GLXContext glx_context_handle = (GLXContext)glx_context->GetHandle();
+  video_decoder->SetGlxState(display, glx_context_handle);
+#endif // ARCH_CPU_ARMEL
 #endif  // OS_WIN
   video_decode_accelerator_ = video_decoder;
   if (!video_decode_accelerator_->Initialize(profile))
     NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
 #else  // Update RenderViewImpl::createMediaPlayer when adding clauses.
   NOTIMPLEMENTED() << "HW video decode acceleration not available.";
   NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
-#endif  // defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
+#endif  // defined(OS_CHROMEOS) || defined(OS_WIN)
 }
 
 void GpuVideoDecodeAccelerator::OnDecode(
     base::SharedMemoryHandle handle, int32 id, int32 size) {
   DCHECK(video_decode_accelerator_.get());
   video_decode_accelerator_->Decode(media::BitstreamBuffer(id, handle, size));
 }
 
 void GpuVideoDecodeAccelerator::OnAssignPictureBuffers(
       const std::vector<int32>& buffer_ids,
@@ skipping 75 matching lines @@
 
 void GpuVideoDecodeAccelerator::NotifyResetDone() {
   if (!Send(new AcceleratedVideoDecoderHostMsg_ResetDone(host_route_id_)))
     DLOG(ERROR) << "Send(AcceleratedVideoDecoderHostMsg_ResetDone) failed";
 }
 
 bool GpuVideoDecodeAccelerator::Send(IPC::Message* message) {
   DCHECK(sender_);
   return sender_->Send(message);
 }