[Mojo Video Capture] Simplify media::VideoCaptureDevice::Client:Buffer to a struct

content/browser/renderer_host/media/video_capture_controller.h

Index: content/browser/renderer_host/media/video_capture_controller.h
diff --git a/content/browser/renderer_host/media/video_capture_controller.h b/content/browser/renderer_host/media/video_capture_controller.h
index 4be8085bbf67c870971c272da674c7e897691234..fc6e6d0607a57f20d6708ec4dd0fab253c3cbe16 100644
--- a/content/browser/renderer_host/media/video_capture_controller.h
+++ b/content/browser/renderer_host/media/video_capture_controller.h
@@ -67,11 +67,10 @@ class CONTENT_EXPORT VideoCaptureController : public media::VideoFrameReceiver {
 
   base::WeakPtr<VideoCaptureController> GetWeakPtrForIOThread();
 
-  // Factory code creating instances of VideoCaptureController must set a
-  // FrameBufferPool before any of the media::VideoFrameReceiver are used.
-  // Setting the observer is done in this method separate from the constructor
-  // in order to allow use the media::VideoFrameReceiver methods
-  // before the observer can be provided. (This is the case with
+  // Factory code creating instances of VideoCaptureController may optionally
+  // set a FrameBufferPool. Setting the host is done in this method
+  // separate from the constructor to allow clients to create and use instances
+  // before they can provide the observer. (This is the case with

[mcasas, 2017/01/05 20:37:01]

If you're using Sublime, Sublime-wrap-plus [1] can help reflowing
this paragraph (e.g. I see "separate" can go in l.72, right?) 


[1] https://github.com/ehuss/Sublime-Wrap-Plus

[chfremer, 2017/01/05 22:44:48]

Done. Thanks for the link to the plugin.
Super useful.

   // VideoCaptureManager).
   void SetFrameBufferPool(
       std::unique_ptr<media::FrameBufferPool> frame_buffer_pool);
@@ -134,7 +133,7 @@ class CONTENT_EXPORT VideoCaptureController : public media::VideoFrameReceiver {
 
   // Implementation of media::VideoFrameReceiver interface:
   void OnIncomingCapturedVideoFrame(
-      std::unique_ptr<media::VideoCaptureDevice::Client::Buffer> buffer,
+      media::VideoCaptureDevice::Client::Buffer buffer,
       scoped_refptr<media::VideoFrame> frame) override;
   void OnError() override;
   void OnLog(const std::string& message) override;
@@ -150,8 +149,7 @@ class CONTENT_EXPORT VideoCaptureController : public media::VideoFrameReceiver {
         int buffer_id,
         int frame_feedback_id,
         media::VideoFrameConsumerFeedbackObserver* consumer_feedback_observer,
-        media::FrameBufferPool* frame_buffer_pool,
-        scoped_refptr<media::VideoFrame> frame);
+        media::FrameBufferPool* frame_buffer_pool);
     ~BufferState();
     BufferState(const BufferState& other);
     void RecordConsumerUtilization(double utilization);
@@ -167,16 +165,10 @@ class CONTENT_EXPORT VideoCaptureController : public media::VideoFrameReceiver {
     const int frame_feedback_id_;
     media::VideoFrameConsumerFeedbackObserver* consumer_feedback_observer_;
     media::FrameBufferPool* frame_buffer_pool_;
-    const scoped_refptr<media::VideoFrame> frame_;
     double max_consumer_utilization_;
     int consumer_hold_count_;
   };
 
-  // Notify renderer that a new buffer has been created.
-  void DoNewBufferOnIOThread(ControllerClient* client,
-                             media::VideoCaptureDevice::Client::Buffer* buffer,
-                             const scoped_refptr<media::VideoFrame>& frame);
-
   // Find a client of |id| and |handler| in |clients|.
   ControllerClient* FindClient(VideoCaptureControllerID id,
                                VideoCaptureControllerEventHandler* handler,