hook up new MacVideoDecodeAccelerator

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 "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "gpu/command_buffer/common/command_buffer.h"
+#include "gpu/command_buffer/service/texture_manager.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
+#include "ui/gfx/size.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_surface_egl.h"
 
-#if (defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)) || defined(OS_WIN)
 #if defined(OS_WIN)
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
-#else  // OS_WIN
+#include "base/win/windows_version.h"

[jochen (gone - plz use gerrit), 2012/05/19 20:16:11]

nit. alphabetical ordering

[Ami GONE FROM CHROMIUM, 2012/05/19 20:46:12]

sort order

[sail, 2012/05/30 03:51:33]

Done.

[sail, 2012/05/30 03:51:33]

Done.

+#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
 #include "content/common/gpu/media/omx_video_decode_accelerator.h"
-#endif  // OS_WIN
-#include "ui/gl/gl_context.h"
-#include "ui/gl/gl_surface_egl.h"
+#elif defined(OS_MACOSX)
+#include "content/common/gpu/media/mac_video_decode_accelerator.h"
 #endif
 
-#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)
     : sender_(sender),
       init_done_msg_(NULL),
       host_route_id_(host_route_id),
       stub_(stub),
@@ skipping 73 matching lines @@
 void GpuVideoDecodeAccelerator::Initialize(
     const media::VideoCodecProfile profile,
     const gfx::Size& frame_size,
     const std::vector<uint8_t>& extra_data,
     IPC::Message* init_done_msg) {
   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)
-  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);
-#else  // OS_WIN
-  OmxVideoDecodeAccelerator* video_decoder =
-      new OmxVideoDecodeAccelerator(this);
+  scoped_refptr<DXVAVideoDecodeAccelerator> video_decoder(

[Ami GONE FROM CHROMIUM, 2012/05/19 20:46:12]

Since you're already duplicating the assignment to video_decode_accelerator_ in
each of the #if clauses, might as well drop the stack-local scoped_refptr
video_decoder in each of the clauses and just assign to v_d_a_ directly.

[sail, 2012/05/29 04:21:28]

Unfortunately, the code still needs to be able to call the platform specific
functions for each decoder after creation. For example, SetEglState().

+      new DXVAVideoDecodeAccelerator(this));
+  video_decode_accelerator_ = video_decoder;
+#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
+  scoped_refptr<OmxVideoDecodeAccelerator> video_decoder(
+      new OmxVideoDecodeAccelerator(this));
   video_decoder->SetEglState(
       gfx::GLSurfaceEGL::GetHardwareDisplay(),
       stub_->decoder()->GetGLContext()->GetHandle());
-#endif  // OS_WIN
   video_decode_accelerator_ = video_decoder;
-  if (!video_decode_accelerator_->Initialize(profile, frame_size, extra_data))
-    NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
+#elif defined(OS_MACOSX)
+  scoped_refptr<MacVideoDecodeAccelerator> video_decoder(
+      new MacVideoDecodeAccelerator(this));
+  video_decoder->SetGLContext(stub_->decoder()->GetGLContext()->GetHandle());
+  video_decode_accelerator_ = video_decoder;
 #else  // Update RenderViewImpl::createMediaPlayer when adding clauses.

[Ami GONE FROM CHROMIUM, 2012/05/19 20:46:12]

I'm pretty sure you need to rebase this CL to pick up the newly landed VDA for
libVA.

[sail, 2012/05/29 04:21:28]

Yea definitely. I'll rebase all the CLs as things start to land.

   NOTIMPLEMENTED() << "HW video decode acceleration not available.";
   NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
-#endif  // defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
+  return;
+#endif
+
+  if (!video_decode_accelerator_->Initialize(profile, frame_size, extra_data))
+    NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
 }
 
 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);
 }