Revert of [Mojo Video Capture] Replace method OnIncomingCapturedVideoFrame with OnIncomingCapturedBufferExt

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 193 matching lines @@
     base::TimeDelta estimated_frame_duration,
     scoped_refptr<VideoFrame> frame,
     base::TimeTicks reference_time,
     bool success) {
   TRACE_EVENT_ASYNC_END2("gpu.capture", "Capture", buffer.get(), "success",
                          success, "timestamp",
                          reference_time.ToInternalValue());
 
   base::AutoLock guard(lock_);
 
-  if (!oracle_.CompleteCapture(frame_number, success, &reference_time))
-    return;
+  if (oracle_.CompleteCapture(frame_number, success, &reference_time)) {
+    TRACE_EVENT_INSTANT0("gpu.capture", "CaptureSucceeded",
+                         TRACE_EVENT_SCOPE_THREAD);
 
-  TRACE_EVENT_INSTANT0("gpu.capture", "CaptureSucceeded",
-                       TRACE_EVENT_SCOPE_THREAD);
+    if (!client_)
+      return;  // Capture is stopped.
 
-  if (!client_)
-    return;  // Capture is stopped.
+    frame->metadata()->SetDouble(VideoFrameMetadata::FRAME_RATE,
+                                 params_.requested_format.frame_rate);
+    frame->metadata()->SetTimeTicks(VideoFrameMetadata::CAPTURE_BEGIN_TIME,
+                                    capture_begin_time);
+    frame->metadata()->SetTimeTicks(VideoFrameMetadata::CAPTURE_END_TIME,
+                                    base::TimeTicks::Now());
+    frame->metadata()->SetTimeDelta(VideoFrameMetadata::FRAME_DURATION,
+                                    estimated_frame_duration);
+    frame->metadata()->SetTimeTicks(VideoFrameMetadata::REFERENCE_TIME,
+                                    reference_time);
 
-  frame->metadata()->SetDouble(VideoFrameMetadata::FRAME_RATE,
-                               params_.requested_format.frame_rate);
-  frame->metadata()->SetTimeTicks(VideoFrameMetadata::CAPTURE_BEGIN_TIME,
-                                  capture_begin_time);
-  frame->metadata()->SetTimeTicks(VideoFrameMetadata::CAPTURE_END_TIME,
-                                  base::TimeTicks::Now());
-  frame->metadata()->SetTimeDelta(VideoFrameMetadata::FRAME_DURATION,
-                                  estimated_frame_duration);
-  frame->metadata()->SetTimeTicks(VideoFrameMetadata::REFERENCE_TIME,
-                                  reference_time);
-
-  DCHECK(frame->IsMappable());
-  media::VideoCaptureFormat format(frame->coded_size(),
-                                   params_.requested_format.frame_rate,
-                                   frame->format(), media::PIXEL_STORAGE_CPU);
-  client_->OnIncomingCapturedBufferExt(
-      std::move(buffer), format, reference_time, frame->timestamp(),
-      frame->visible_rect(), *frame->metadata());
+    client_->OnIncomingCapturedVideoFrame(std::move(buffer), std::move(frame));
+  }
 }
 
 void ThreadSafeCaptureOracle::OnConsumerReportingUtilization(
     int frame_number,
     double utilization) {
   base::AutoLock guard(lock_);
   oracle_.RecordConsumerFeedback(frame_number, utilization);
 }
 
 }  // namespace media