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

media/capture/content/thread_safe_capture_oracle.cc

 // Copyright 2014 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 "media/capture/content/thread_safe_capture_oracle.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
@@ skipping 113 matching lines @@
   }  // End of critical section.
 
   if (attenuated_utilization >= 1.0) {
     TRACE_EVENT_INSTANT2(
         "gpu.capture", "NearlyPipelineLimited", TRACE_EVENT_SCOPE_THREAD,
         "trigger", VideoCaptureOracle::EventAsString(event),
         "atten_util_percent",
         base::saturated_cast<int>(attenuated_utilization * 100.0 + 0.5));
   }
 
-  TRACE_EVENT_ASYNC_BEGIN2("gpu.capture", "Capture", output_buffer.id(),
+  TRACE_EVENT_ASYNC_BEGIN2("gpu.capture", "Capture", output_buffer.id,
                            "frame_number", frame_number, "trigger",
                            VideoCaptureOracle::EventAsString(event));
 
   auto output_buffer_access =
-      output_buffer.handle_provider()->GetHandleForInProcessAccess();
+      output_buffer.handle_provider->GetHandleForInProcessAccess();
   DCHECK_EQ(media::PIXEL_STORAGE_CPU, params_.requested_format.pixel_storage);
   *storage = VideoFrame::WrapExternalSharedMemory(
       params_.requested_format.pixel_format, coded_size,
       gfx::Rect(visible_size), visible_size, output_buffer_access->data(),
       output_buffer_access->mapped_size(), base::SharedMemory::NULLHandle(), 0u,
       base::TimeDelta());
   // If creating the VideoFrame wrapper failed, call DidCaptureFrame() with
   // !success to execute the required post-capture steps (tracing, notification
   // of failure to VideoCaptureOracle, etc.).
   if (!(*storage)) {
@@ skipping 49 matching lines @@
 }
 
 void ThreadSafeCaptureOracle::DidCaptureFrame(
     int frame_number,
     VideoCaptureDevice::Client::Buffer buffer,
     base::TimeTicks capture_begin_time,
     base::TimeDelta estimated_frame_duration,
     scoped_refptr<VideoFrame> frame,
     base::TimeTicks reference_time,
     bool success) {
-  TRACE_EVENT_ASYNC_END2("gpu.capture", "Capture", buffer.id(), "success",
+  TRACE_EVENT_ASYNC_END2("gpu.capture", "Capture", buffer.id, "success",
                          success, "timestamp",
                          reference_time.ToInternalValue());
 
   base::AutoLock guard(lock_);
 
   if (!oracle_.CompleteCapture(frame_number, success, &reference_time))
     return;
 
   TRACE_EVENT_INSTANT0("gpu.capture", "CaptureSucceeded",
                        TRACE_EVENT_SCOPE_THREAD);
@@ skipping 22 matching lines @@
 }
 
 void ThreadSafeCaptureOracle::OnConsumerReportingUtilization(
     int frame_number,
     double utilization) {
   base::AutoLock guard(lock_);
   oracle_.RecordConsumerFeedback(frame_number, utilization);
 }
 
 }  // namespace media