Revert of Introduce GpuVideoDecodeAcceleratorFactory.

content/common/gpu/media/v4l2_slice_video_decode_accelerator.h

 // Copyright 2015 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_V4L2_SLICE_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_V4L2_SLICE_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <linux/videodev2.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <queue>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "content/common/content_export.h"
-#include "content/common/gpu/media/gpu_video_decode_accelerator_helpers.h"
 #include "content/common/gpu/media/h264_decoder.h"
 #include "content/common/gpu/media/v4l2_device.h"
 #include "content/common/gpu/media/vp8_decoder.h"
 #include "media/video/video_decode_accelerator.h"
 
 namespace content {
 
 // An implementation of VideoDecodeAccelerator that utilizes the V4L2 slice
 // level codec API for decoding. The slice level API provides only a low-level
 // decoding functionality and requires userspace to provide support for parsing
 // the input stream and managing decoder state across frames.
 class CONTENT_EXPORT V4L2SliceVideoDecodeAccelerator
     : public media::VideoDecodeAccelerator {
  public:
   class V4L2DecodeSurface;
 
   V4L2SliceVideoDecodeAccelerator(
       const scoped_refptr<V4L2Device>& device,
       EGLDisplay egl_display,
-      const GetGLContextCallback& get_gl_context_cb,
-      const MakeGLContextCurrentCallback& make_context_current_cb);
+      EGLContext egl_context,
+      const base::WeakPtr<Client>& io_client_,
+      const base::Callback<bool(void)>& make_context_current,
+      const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner);
   ~V4L2SliceVideoDecodeAccelerator() override;
 
   // media::VideoDecodeAccelerator implementation.
   bool Initialize(const Config& config, Client* client) override;
   void Decode(const media::BitstreamBuffer& bitstream_buffer) override;
   void AssignPictureBuffers(
       const std::vector<media::PictureBuffer>& buffers) override;
   void ReusePictureBuffer(int32_t picture_buffer_id) override;
   void Flush() override;
   void Reset() override;
   void Destroy() override;
-  bool TryToSetupDecodeOnSeparateThread(
-      const base::WeakPtr<Client>& decode_client,
-      const scoped_refptr<base::SingleThreadTaskRunner>& decode_task_runner)
-      override;
+  bool CanDecodeOnIOThread() override;
 
   static media::VideoDecodeAccelerator::SupportedProfiles
       GetSupportedProfiles();
 
  private:
   class V4L2H264Accelerator;
   class V4L2VP8Accelerator;
 
   // Record for input buffers.
   struct InputRecord {
@@ skipping 229 matching lines @@
 
   // Callback that indicates a picture has been cleared.
   void PictureCleared();
 
   size_t input_planes_count_;
   size_t output_planes_count_;
 
   // GPU Child thread task runner.
   const scoped_refptr<base::SingleThreadTaskRunner> child_task_runner_;
 
-  // Task runner Decode() and PictureReady() run on.
-  scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner_;
+  // IO thread task runner.
+  scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
 
   // WeakPtr<> pointing to |this| for use in posting tasks from the decoder or
   // device worker threads back to the child thread.
   base::WeakPtr<V4L2SliceVideoDecodeAccelerator> weak_this_;
 
   // To expose client callbacks from VideoDecodeAccelerator.
   // NOTE: all calls to these objects *MUST* be executed on
   // child_task_runner_.
   scoped_ptr<base::WeakPtrFactory<VideoDecodeAccelerator::Client>>
       client_ptr_factory_;
   base::WeakPtr<VideoDecodeAccelerator::Client> client_;
-  // Callbacks to |decode_client_| must be executed on |decode_task_runner_|.
-  base::WeakPtr<Client> decode_client_;
+  // Callbacks to |io_client_| must be executed on |io_task_runner_|.
+  base::WeakPtr<Client> io_client_;
 
   // V4L2 device in use.
   scoped_refptr<V4L2Device> device_;
 
   // Thread to communicate with the device on.
   base::Thread decoder_thread_;
   scoped_refptr<base::SingleThreadTaskRunner> decoder_thread_task_runner_;
 
   // Thread used to poll the device for events.
   base::Thread device_poll_thread_;
@@ skipping 60 matching lines @@
   V4L2DecodeSurfaceByPictureBufferId surfaces_at_display_;
 
   // Record for decoded pictures that can be sent to PictureReady.
   struct PictureRecord;
   // Pictures that are ready but not sent to PictureReady yet.
   std::queue<PictureRecord> pending_picture_ready_;
 
   // The number of pictures that are sent to PictureReady and will be cleared.
   int picture_clearing_count_;
 
+  // Make the GL context current callback.
+  base::Callback<bool(void)> make_context_current_;
+
   // EGL state
   EGLDisplay egl_display_;
-
-  // Callback to get current GLContext.
-  GetGLContextCallback get_gl_context_cb_;
-  // Callback to set the correct gl context.
-  MakeGLContextCurrentCallback make_context_current_cb_;
+  EGLContext egl_context_;
 
   // The WeakPtrFactory for |weak_this_|.
   base::WeakPtrFactory<V4L2SliceVideoDecodeAccelerator> weak_this_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(V4L2SliceVideoDecodeAccelerator);
 };
 
 class V4L2H264Picture;
 class V4L2VP8Picture;
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_V4L2_SLICE_VIDEO_DECODE_ACCELERATOR_H_