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

media/capture/video/video_capture_device.h

 // 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.
 //
 // VideoCaptureDevice is the abstract base class for realizing video capture
 // device support in Chromium. It provides the interface for OS dependent
 // implementations.
 // The class is created and functions are invoked on a thread owned by
 // VideoCaptureManager. Capturing is done on other threads, depending on the OS
 // specific implementation.
@@ skipping 129 matching lines @@
     // purposes of buffer throttling.
     //
     // The output buffer stays reserved and mapped for use until the Buffer
     // object is destroyed or returned.
     virtual std::unique_ptr<Buffer> ReserveOutputBuffer(
         const gfx::Size& dimensions,
         VideoPixelFormat format,
         VideoPixelStorage storage,
         int frame_feedback_id) = 0;
 
-    // Provides VCD::Client with a populated Buffer containing the content of
-    // the next video frame. The |buffer| must originate from an earlier call to
-    // ReserveOutputBuffer().
+    // Captured new video data, held in |frame| or |buffer|, respectively for
+    // OnIncomingCapturedVideoFrame() and  OnIncomingCapturedBuffer().
+    //
+    // In both cases, as the frame is backed by a reservation returned by
+    // ReserveOutputBuffer(), delivery is guaranteed and will require no
+    // additional copies in the browser process.
     // See OnIncomingCapturedData for details of |reference_time| and
     // |timestamp|.
+    // TODO(chfremer): Consider removing one of the two in order to simplify the
+    // interface.
     virtual void OnIncomingCapturedBuffer(std::unique_ptr<Buffer> buffer,
                                           const VideoCaptureFormat& format,
                                           base::TimeTicks reference_time,
                                           base::TimeDelta timestamp) = 0;
-
-    // Extended version of OnIncomingCapturedBuffer() allowing clients to
-    // pass a custom |visible_rect| and |additional_metadata|.
-    virtual void OnIncomingCapturedBufferExt(
+    virtual void OnIncomingCapturedVideoFrame(
         std::unique_ptr<Buffer> buffer,
-        const VideoCaptureFormat& format,
-        base::TimeTicks reference_time,
-        base::TimeDelta timestamp,
-        gfx::Rect visible_rect,
-        const VideoFrameMetadata& additional_metadata) = 0;
+        scoped_refptr<VideoFrame> frame) = 0;
 
     // Attempts to reserve the same Buffer provided in the last call to one of
-    // the OnIncomingCapturedBufferXXX() methods. This will fail if the content
-    // of the Buffer has not been preserved, or if the |dimensions|, |format|,
-    // or |storage| disagree with how it was reserved via ReserveOutputBuffer().
+    // the OnIncomingCapturedXXX() methods. This will fail if the content of the
+    // Buffer has not been preserved, or if the |dimensions|, |format|, or
+    // |storage| disagree with how it was reserved via ReserveOutputBuffer().
     // When this operation fails, nullptr will be returned.
     virtual std::unique_ptr<Buffer> ResurrectLastOutputBuffer(
         const gfx::Size& dimensions,
         VideoPixelFormat format,
         VideoPixelStorage storage,
         int new_frame_feedback_id) = 0;
 
     // An error has occurred that cannot be handled and VideoCaptureDevice must
     // be StopAndDeAllocate()-ed. |reason| is a text description of the error.
     virtual void OnError(const tracked_objects::Location& from_here,
@@ skipping 93 matching lines @@
 
  private:
   // Gets the power line frequency from the current system time zone if this is
   // defined, otherwise returns 0.
   PowerLineFrequency GetPowerLineFrequencyForLocation() const;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_H_