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 66 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 ClientVideoCaptureBuffer;

[reveman, 2015/08/26 11:54:05]

ClientBuffer2? I think the existing comment is sufficient. GMBs are shared
memory..

[emircan, 2015/08/26 21:23:12]

Done.

 
   // VideoCaptureMessageFilter::Delegate interface.
   void OnBufferCreated(base::SharedMemoryHandle handle,
                        int length,
                        int buffer_id) override;
+  void OnBufferCreated2(
+      const std::vector<gfx::GpuMemoryBufferHandle>& gmb_handles,

[reveman, 2015/08/26 11:54:05]

nit: s/gmb_handles/handles/

[emircan, 2015/08/26 21:23:12]

Done.

+      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 gpu::MailboxHolder& mailbox_holders) override;

[reveman, 2015/08/26 11:54:05]

why "holders??

[emircan, 2015/08/26 21:23:12]

Done.

   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 OnClientBufferFinished2(
+      int buffer_id,
+      const scoped_refptr<ClientVideoCaptureBuffer>& 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<ClientVideoCaptureBuffer>>
+      ClientVideoCaptureBufferMap;
+  ClientVideoCaptureBufferMap client_video_capture_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_