Revert of Introduce GpuVideoDecodeAcceleratorFactory.

content/common/gpu/media/gpu_video_decode_accelerator.h

 // 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.
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/shared_memory.h"
 #include "base/synchronization/waitable_event.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
-#include "content/common/gpu/media/gpu_video_decode_accelerator_helpers.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "gpu/config/gpu_info.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 #include "media/video/video_decode_accelerator.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace gpu {
 struct GpuPreferences;
 }  // namespace gpu
@@ skipping 41 matching lines @@
   // Function to delegate sending to actual sender.
   bool Send(IPC::Message* message) override;
 
   // Initialize VDAs from the set of VDAs supported for current platform until
   // one of them succeeds for given |config|. Send the |init_done_msg| when
   // done. filter_ is passed to GpuCommandBufferStub channel only if the chosen
   // VDA can decode on IO thread.
   bool Initialize(const media::VideoDecodeAccelerator::Config& config);
 
  private:
+  typedef scoped_ptr<media::VideoDecodeAccelerator> (
+      GpuVideoDecodeAccelerator::*CreateVDAFp)();
+
   class MessageFilter;
 
+#if defined(OS_WIN)
+  scoped_ptr<media::VideoDecodeAccelerator> CreateDXVAVDA();
+#endif
+#if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC)
+  scoped_ptr<media::VideoDecodeAccelerator> CreateV4L2VDA();
+  scoped_ptr<media::VideoDecodeAccelerator> CreateV4L2SliceVDA();
+#endif
+#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
+  scoped_ptr<media::VideoDecodeAccelerator> CreateVaapiVDA();
+#endif
+#if defined(OS_MACOSX)
+  scoped_ptr<media::VideoDecodeAccelerator> CreateVTVDA();
+#endif
+#if !defined(OS_CHROMEOS) && defined(USE_OZONE)
+  scoped_ptr<media::VideoDecodeAccelerator> CreateOzoneVDA();
+#endif
+#if defined(OS_ANDROID)
+  scoped_ptr<media::VideoDecodeAccelerator> CreateAndroidVDA();
+#endif
+
   // We only allow self-delete, from OnWillDestroyStub(), after cleanup there.
   ~GpuVideoDecodeAccelerator() override;
 
   // Handlers for IPC messages.
   void OnSetCdm(int cdm_id);
   void OnDecode(const media::BitstreamBuffer& bitstream_buffer);
   void OnAssignPictureBuffers(const std::vector<int32_t>& buffer_ids,
                               const std::vector<uint32_t>& texture_ids);
   void OnReusePictureBuffer(int32_t picture_buffer_id);
   void OnFlush();
   void OnReset();
   void OnDestroy();
 
   // Called on IO thread when |filter_| has been removed.
   void OnFilterRemoved();
 
   // Sets the texture to cleared.
   void SetTextureCleared(const media::Picture& picture);
 
+#if (defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)) || defined(OS_MACOSX)
+  // Helper to bind |image| to the texture specified by |client_texture_id|. If
+  // |can_bind_to_sampler| is true, then the image may be used as a sampler
+  // directly, otherwise a copy to a staging buffer is required.
+  void BindImage(uint32_t client_texture_id,
+                 uint32_t texture_target,
+                 scoped_refptr<gl::GLImage> image,
+                 bool can_bind_to_sampler);
+#endif
+
   // Route ID to communicate with the host.
   const int32_t host_route_id_;
 
   // Unowned pointer to the underlying GpuCommandBufferStub.  |this| is
   // registered as a DestuctionObserver of |stub_| and will self-delete when
   // |stub_| is destroyed.
   GpuCommandBufferStub* const stub_;
 
   // The underlying VideoDecodeAccelerator.
   scoped_ptr<media::VideoDecodeAccelerator> video_decode_accelerator_;
 
-  // Callback to return current GLContext, if available.
-  GetGLContextCallback get_gl_context_cb_;
-
   // Callback for making the relevant context current for GL calls.
-  MakeGLContextCurrentCallback make_context_current_cb_;
-
-  // Callback to bind a GLImage to a given texture id and target.
-  BindGLImageCallback bind_image_cb_;
-
-  // Callback to return a WeakPtr to GLES2Decoder.
-  GetGLES2DecoderCallback get_gles2_decoder_cb_;
+  // Returns false if failed.
+  base::Callback<bool(void)> make_context_current_;
 
   // The texture dimensions as requested by ProvidePictureBuffers().
   gfx::Size texture_dimensions_;
 
   // The texture target as requested by ProvidePictureBuffers().
   uint32_t texture_target_;
 
   // The message filter to run VDA::Decode on IO thread if VDA supports it.
   scoped_refptr<MessageFilter> filter_;
 
@@ skipping 17 matching lines @@
 
   // A map from picture buffer ID to TextureRef that have not been cleared.
   std::map<int32_t, scoped_refptr<gpu::gles2::TextureRef>> uncleared_textures_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(GpuVideoDecodeAccelerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_H_