Pass GpuMemoryBuffer backed VideoFrame from browser to renderer processes

content/renderer/media/video_capture_impl.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_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_
 
 #include <list>
 #include <map>
 
@@ skipping 22 matching lines @@
 // VideoCaptureImpl is also a delegate of VideoCaptureMessageFilter which relays
 // operation of a capture device to the browser process and receives responses
 // from browser process.
 //
 // VideoCaptureImpl is an IO thread only object. See the comments in
 // video_capture_impl_manager.cc for the lifetime of this object.
 // All methods must be called on the IO thread.
 //
 // This is an internal class used by VideoCaptureImplManager only. Do not access
 // this directly.
 class CONTENT_EXPORT VideoCaptureImpl

[mcasas, 2015/08/21 03:57:25]

final : public...?

[emircan, 2015/08/22 03:13:27]

Tried, but the bots turn red as unit tests derive from it.

     : public VideoCaptureMessageFilter::Delegate {
  public:
   ~VideoCaptureImpl() override;
 
   VideoCaptureImpl(media::VideoCaptureSessionId session_id,
                    VideoCaptureMessageFilter* filter);
 
   // Start listening to IPC messages.
   void Init();
 
@@ skipping 23 matching lines @@
 
   media::VideoCaptureSessionId session_id() const { return session_id_; }
 
  private:
   friend class VideoCaptureImplTest;
   friend class MockVideoCaptureImpl;
 
   // Carries a shared memory for transferring video frames from browser to
   // renderer.
   class ClientBuffer;
+  // Carries GpuMemoryBuffers for transferring video frames from browser to
+  // renderer.
+  class ClientGpuMemoryBuffer;
 
   // VideoCaptureMessageFilter::Delegate interface.
-  void OnBufferCreated(base::SharedMemoryHandle handle,
-                       int length,
-                       int buffer_id) override;
+  void OnBufferCreated(

[mcasas, 2015/08/21 03:57:25]

Don't change the indent.

[emircan, 2015/08/22 03:13:26]

Done.

+      base::SharedMemoryHandle handle,
+      int length,
+      int buffer_id) override;
+  void OnGpuMemoryBufferCreated(
+      const std::vector<gfx::GpuMemoryBufferHandle>& gmb_handles,
+      const gfx::Size& size,
+      int buffer_id) override;
   void OnBufferDestroyed(int buffer_id) override;
-  void OnBufferReceived(int buffer_id,
-                        base::TimeTicks timestamp,
-                        const base::DictionaryValue& metadata,
-                        media::VideoPixelFormat pixel_format,
-                        media::VideoFrame::StorageType storage_type,
-                        const gfx::Size& coded_size,
-                        const gfx::Rect& visible_rect,
-                        const gpu::MailboxHolder& mailbox_holder) override;
+  void OnBufferReceived(
+      int buffer_id,
+      base::TimeTicks timestamp,
+      const base::DictionaryValue& metadata,
+      media::VideoPixelFormat pixel_format,
+      media::VideoFrame::StorageType storage_type,
+      const gfx::Size& coded_size,
+      const gfx::Rect& visible_rect,
+      const std::vector<gpu::MailboxHolder>& mailbox_holders) override;
   void OnStateChanged(VideoCaptureState state) override;
   void OnDeviceSupportedFormatsEnumerated(
       const media::VideoCaptureFormats& supported_formats) override;
   void OnDeviceFormatsInUseReceived(
       const media::VideoCaptureFormats& formats_in_use) override;
   void OnDelegateAdded(int32 device_id) override;
 
   // Sends an IPC message to browser process when all clients are done with the
   // buffer.
-  void OnClientBufferFinished(int buffer_id,
-                              const scoped_refptr<ClientBuffer>& buffer,
-                              uint32 release_sync_point,
-                              double consumer_resource_utilization);
+  void OnClientBufferFinished(
+      int buffer_id,
+      const scoped_refptr<ClientBuffer>& buffer,
+      uint32 release_sync_point,
+      double consumer_resource_utilization);
+  void OnClientGpuMemoryBufferFinished(
+      int buffer_id,
+      const scoped_refptr<ClientGpuMemoryBuffer>& gpu_memory_buffer,
+      uint32 release_sync_point,
+      double consumer_resource_utilization);
 
   void StopDevice();
   void RestartCapture();
   void StartCaptureInternal();
 
   virtual void Send(IPC::Message* message);
 
   // Helpers.
   // Called (by an unknown thread) when all consumers are done with a VideoFrame
   // and its ref-count has gone to zero.  This helper function grabs the
@@ skipping 16 matching lines @@
   const int session_id_;
 
   // Vector of callbacks to be notified of device format enumerations, used only
   // on IO Thread.
   std::vector<VideoCaptureDeviceFormatsCB> device_formats_cb_queue_;
   // Vector of callbacks to be notified of a device's in use capture format(s),
   // used only on IO Thread.
   std::vector<VideoCaptureDeviceFormatsCB> device_formats_in_use_cb_queue_;
 
   // Buffers available for sending to the client.
-  typedef std::map<int32, scoped_refptr<ClientBuffer> > ClientBufferMap;
+  typedef std::map<int32, scoped_refptr<ClientBuffer>> ClientBufferMap;
   ClientBufferMap client_buffers_;
+  typedef std::map<int32, scoped_refptr<ClientGpuMemoryBuffer>>
+      ClientGpuMemoryBuffersMap;
+  ClientGpuMemoryBuffersMap client_gmb_buffers_;
 
   // Track information for the video capture client, consisting of parameters
   // for capturing and callbacks to the client.
   media::VideoCaptureParams client_params_;
   VideoCaptureStateUpdateCB state_update_cb_;
   VideoCaptureDeliverFrameCB deliver_frame_cb_;
 
   // The device's first captured frame timestamp sent from browser process side.
   base::TimeTicks first_frame_timestamp_;
 
   // State of this VideoCaptureImpl.
   VideoCaptureState state_;
 
   // IO message loop reference for checking correct class operation.
   scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
 
   // WeakPtrFactory pointing back to |this| object, for use with
   // media::VideoFrames constructed in OnBufferReceived() from buffers cached
   // in |client_buffers_|.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<VideoCaptureImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_