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

content/browser/renderer_host/media/video_capture_controller.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.
 //
 // VideoCaptureController is the glue between a VideoCaptureDevice and all
 // VideoCaptureHosts that have connected to it. A controller exists on behalf of
 // one (and only one) VideoCaptureDevice; both are owned by the
 // VideoCaptureManager.
 //
 // The VideoCaptureController is responsible for:
@@ skipping 49 matching lines @@
 
 namespace content {
 
 class CONTENT_EXPORT VideoCaptureController : public media::VideoFrameReceiver {
  public:
   VideoCaptureController();
   ~VideoCaptureController() override;
 
   base::WeakPtr<VideoCaptureController> GetWeakPtrForIOThread();
 
-  // 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 VideoCaptureManager).
+  // 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
+  // VideoCaptureManager).
   void SetFrameBufferPool(
       std::unique_ptr<media::FrameBufferPool> frame_buffer_pool);
 
   // Factory code creating instances of VideoCaptureController may optionally
   // set a VideoFrameConsumerFeedbackObserver. Setting the observer 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
   // VideoCaptureManager).
   void SetConsumerFeedbackObserver(
       std::unique_ptr<media::VideoFrameConsumerFeedbackObserver> observer);
@@ skipping 41 matching lines @@
                     VideoCaptureControllerEventHandler* event_handler,
                     int buffer_id,
                     double consumer_resource_utilization);
 
   const media::VideoCaptureFormat& GetVideoCaptureFormat() const;
 
   bool has_received_frames() const { return has_received_frames_; }
 
   // Implementation of media::VideoFrameReceiver interface:
   void OnIncomingCapturedVideoFrame(
-      media::VideoCaptureDevice::Client::Buffer buffer,
+      std::unique_ptr<media::VideoCaptureDevice::Client::Buffer> buffer,
       scoped_refptr<media::VideoFrame> frame) override;
   void OnError() override;
   void OnLog(const std::string& message) override;
   void OnBufferDestroyed(int buffer_id_to_drop) override;
 
  private:
   struct ControllerClient;
   typedef std::list<std::unique_ptr<ControllerClient>> ControllerClients;
 
   class BufferState {
    public:
     explicit BufferState(
         int buffer_id,
         int frame_feedback_id,
         media::VideoFrameConsumerFeedbackObserver* consumer_feedback_observer,
-        media::FrameBufferPool* frame_buffer_pool);
+        media::FrameBufferPool* frame_buffer_pool,
+        scoped_refptr<media::VideoFrame> frame);
     ~BufferState();
     BufferState(const BufferState& other);
     void RecordConsumerUtilization(double utilization);
     void IncreaseConsumerCount();
     void DecreaseConsumerCount();
     bool HasZeroConsumerHoldCount();
     void SetConsumerFeedbackObserver(
         media::VideoFrameConsumerFeedbackObserver* consumer_feedback_observer);
     void SetFrameBufferPool(media::FrameBufferPool* frame_buffer_pool);
 
    private:
     const int buffer_id_;
     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,
                                const ControllerClients& clients);
 
   // Find a client of |session_id| in |clients|.
   ControllerClient* FindClient(int session_id,
                                const ControllerClients& clients);
 
   std::unique_ptr<media::FrameBufferPool> frame_buffer_pool_;
@@ skipping 16 matching lines @@
   media::VideoCaptureFormat video_capture_format_;
 
   base::WeakPtrFactory<VideoCaptureController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureController);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_H_