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

content/browser/renderer_host/media/video_capture_host.cc

 // 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.
 
 #include "content/browser/renderer_host/media/video_capture_host.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
+#include "mojo/common/values_struct_traits.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace content {
 
 VideoCaptureHost::VideoCaptureHost(MediaStreamManager* media_stream_manager)
     : media_stream_manager_(media_stream_manager),
       weak_factory_(this) {
   DVLOG(1) << __func__;
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 }
@@ skipping 54 matching lines @@
   if (controllers_.find(controller_id) == controllers_.end())
     return;
 
   if (base::ContainsKey(device_id_to_observer_map_, controller_id))
     device_id_to_observer_map_[controller_id]->OnBufferDestroyed(buffer_id);
 }
 
 void VideoCaptureHost::OnBufferReady(
     VideoCaptureControllerID controller_id,
     int buffer_id,
-    const scoped_refptr<media::VideoFrame>& video_frame) {
+    const media::mojom::VideoFrameInfoPtr& frame_info) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (controllers_.find(controller_id) == controllers_.end())
     return;
 
   if (!base::ContainsKey(device_id_to_observer_map_, controller_id))
     return;
 
-  media::mojom::VideoFrameInfoPtr info = media::mojom::VideoFrameInfo::New();
-  info->timestamp = video_frame->timestamp();
-  info->metadata = video_frame->metadata()->CopyInternalValues();
-
-  DCHECK(media::PIXEL_FORMAT_I420 == video_frame->format() ||
-         media::PIXEL_FORMAT_Y16 == video_frame->format());
-  info->pixel_format = video_frame->format();
-  info->storage_type = media::PIXEL_STORAGE_CPU;
-  info->coded_size = video_frame->coded_size();
-  info->visible_rect = video_frame->visible_rect();
-
   device_id_to_observer_map_[controller_id]->OnBufferReady(buffer_id,
-                                                           std::move(info));
+                                                           frame_info.Clone());
 }
 
 void VideoCaptureHost::OnEnded(VideoCaptureControllerID controller_id) {
   DVLOG(1) << __func__;
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&VideoCaptureHost::DoEnded, weak_factory_.GetWeakPtr(),
                  controller_id));
 }
@@ skipping 206 matching lines @@
   const base::WeakPtr<VideoCaptureController> controller = it->second;
   controllers_.erase(it);
   if (!controller)
     return;
 
   media_stream_manager_->video_capture_manager()->StopCaptureForClient(
       controller.get(), controller_id, this, on_error);
 }
 
 }  // namespace content