[Mojo Video Capture] Split OnIncomingCapturedVideoFrame() to OnNewBuffer() + OnFrameReadyInBuffer()

media/capture/video/video_frame_receiver.h

Index: media/capture/video/video_frame_receiver.h
diff --git a/media/capture/video/video_frame_receiver.h b/media/capture/video/video_frame_receiver.h
index 55d98aa564ae49ca38a8761a9b788bd63810e621..a7086d3eb4150bf178b5fa60c217fde0eaed3259 100644
--- a/media/capture/video/video_frame_receiver.h
+++ b/media/capture/video/video_frame_receiver.h
@@ -6,6 +6,8 @@
 #define MEDIA_CAPTURE_VIDEO_VIDEO_FRAME_RECEIVER_H_
 
 #include "media/capture/capture_export.h"
+#include "media/capture/mojo/video_capture_types.mojom.h"
+#include "media/capture/video/video_capture_buffer_handle.h"
 #include "media/capture/video/video_capture_device.h"
 
 namespace media {
@@ -16,12 +18,37 @@ class CAPTURE_EXPORT VideoFrameReceiver {
  public:
   virtual ~VideoFrameReceiver(){};
 
-  virtual void OnIncomingCapturedVideoFrame(
-      media::VideoCaptureDevice::Client::Buffer buffer,
-      scoped_refptr<media::VideoFrame> frame) = 0;
+  // Tells the VideoFrameReceiver that the producer is going to subsequently use
+  // the provided buffer as one of possibly many for frame delivery via
+  // OnFrameReadyInBuffer(). Note, that a call to this method does not mean that
+  // the caller allows the receiver to read from or write to the buffer.
+  virtual void OnNewBufferHandle(
+      int buffer_id,
+      std::unique_ptr<BufferHandleProvider> handle_provider) = 0;
+
+  // Tells the VideoFrameReceiver that a new frame is ready for consumption
+  // in the buffer with id |buffer_id| and allows it to read the data from
+  // the buffer. The producer guarantees that the buffer and its contents stay
+  // alive and unchanged until VideoFrameReceiver releases the given
+  // |buffer_read_permission|.
+  virtual void OnFrameReadyInBuffer(
+      int buffer_id,
+      int frame_feedback_id,
+      std::unique_ptr<Ownership> buffer_read_permission,
+      mojom::VideoFrameInfoPtr frame_info) = 0;
+
+  // Tells the VideoFrameReceiver that the producer is no longer going to use
+  // the buffer with id |buffer_id| for frame delivery. This may be called even
+  // while the receiver is still holding |buffer_read_permission| from a call to
+  // OnFrameReadInBuffer() for the same buffer. In that case, it means that the
+  // caller is asking the VideoFrameReceiver to release the read permission and
+  // buffer handle at its earliest convenience.
+  // The producer guarantees that it does not reuse a retired buffer_id before
+  // having cycled through all other possible values.
+  virtual void OnBufferRetired(int buffer_id) = 0;
+
   virtual void OnError() = 0;
   virtual void OnLog(const std::string& message) = 0;
-  virtual void OnBufferDestroyed(int buffer_id_to_drop) = 0;
 };
 
 }  // namespace media