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

content/browser/renderer_host/media/video_frame_receiver_on_io_thread.cc

Index: content/browser/renderer_host/media/video_frame_receiver_on_io_thread.cc
diff --git a/content/browser/renderer_host/media/video_frame_receiver_on_io_thread.cc b/content/browser/renderer_host/media/video_frame_receiver_on_io_thread.cc
index d9f4a3f0cfa3fc1e0f53506c16f81af63f47567d..73761dc945e0139278bb3b6b41a2ecb62144cc6d 100644
--- a/content/browser/renderer_host/media/video_frame_receiver_on_io_thread.cc
+++ b/content/browser/renderer_host/media/video_frame_receiver_on_io_thread.cc
@@ -14,32 +14,44 @@ VideoFrameReceiverOnIOThread::VideoFrameReceiverOnIOThread(
 
 VideoFrameReceiverOnIOThread::~VideoFrameReceiverOnIOThread() = default;
 
-void VideoFrameReceiverOnIOThread::OnIncomingCapturedVideoFrame(
-    media::VideoCaptureDevice::Client::Buffer buffer,
-    scoped_refptr<media::VideoFrame> frame) {
+void VideoFrameReceiverOnIOThread::OnNewBufferHandle(
+    int buffer_id,
+    std::unique_ptr<media::BufferHandleProvider> handle_provider) {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&VideoFrameReceiver::OnIncomingCapturedVideoFrame, receiver_,
-                 base::Passed(&buffer), frame));
+      base::Bind(&VideoFrameReceiver::OnNewBufferHandle, receiver_, buffer_id,
+                 base::Passed(std::move(handle_provider))));
 }
 
-void VideoFrameReceiverOnIOThread::OnError() {
+void VideoFrameReceiverOnIOThread::OnFrameReadyInBuffer(
+    int buffer_id,
+    int frame_feedback_id,
+    std::unique_ptr<media::Ownership> buffer_read_permission,
+    media::mojom::VideoFrameInfoPtr frame_info) {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&VideoFrameReceiver::OnError, receiver_));
+      base::Bind(&VideoFrameReceiver::OnFrameReadyInBuffer, receiver_,
+                 buffer_id, frame_feedback_id,
+                 base::Passed(&buffer_read_permission),
+                 base::Passed(&frame_info)));
 }
 
-void VideoFrameReceiverOnIOThread::OnLog(const std::string& message) {
+void VideoFrameReceiverOnIOThread::OnBufferRetired(int buffer_id) {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&VideoFrameReceiver::OnLog, receiver_, message));
+      base::Bind(&VideoFrameReceiver::OnBufferRetired, receiver_, buffer_id));
+}
+
+void VideoFrameReceiverOnIOThread::OnError() {
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO, FROM_HERE,
+      base::Bind(&VideoFrameReceiver::OnError, receiver_));
 }
 
-void VideoFrameReceiverOnIOThread::OnBufferDestroyed(int buffer_id_to_drop) {
+void VideoFrameReceiverOnIOThread::OnLog(const std::string& message) {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&VideoFrameReceiver::OnBufferDestroyed, receiver_,
-                 buffer_id_to_drop));
+      base::Bind(&VideoFrameReceiver::OnLog, receiver_, message));
 }
 
 }  // namespace content