Revert 236927 "Reorganize media::VideoCapture* types"

trunk/src/media/video/capture/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.
 
 #ifndef MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_H_
 #define MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_H_
 
 #include <list>
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "media/base/media_export.h"
-#include "media/base/video_frame.h"
 #include "media/video/capture/video_capture_types.h"
 
 namespace media {
 
 class MEDIA_EXPORT VideoCaptureDevice {
  public:
   // Represents a capture device name and ID.
   // You should not create an instance of this class directly by e.g. setting
   // various properties directly.  Instead use
   // VideoCaptureDevice::GetDeviceNames to do this for you and if you need to
@@ skipping 132 matching lines @@
     // This method will try to reserve an output buffer and copy from |data|
     // into the output buffer. If no output buffer is available, the frame will
     // be silently dropped.
     virtual void OnIncomingCapturedFrame(
         const uint8* data,
         int length,
         base::Time timestamp,
         int rotation,  // Clockwise.
         bool flip_vert,
         bool flip_horiz,
-        const VideoCaptureFormat& frame_format) = 0;
+        const VideoCaptureCapability& frame_info) = 0;
 
     // Captured a new video frame, held in |buffer|.
     //
     // As the frame is backed by a reservation returned by
     // ReserveOutputBuffer(), delivery is guaranteed and will require no
     // additional copies in the browser process. |dimensions| indicates the
     // frame width and height of the buffer contents; this is assumed to be of
     // |format| format and tightly packed.
     virtual void OnIncomingCapturedBuffer(const scoped_refptr<Buffer>& buffer,
                                           media::VideoFrame::Format format,
@@ skipping 15 matching lines @@
   static void GetDeviceNames(Names* device_names);
 
   // Gets the capabilities of a particular device attached to the system. This
   // method should be called before allocating or starting a device. In case
   // format enumeration is not supported, or there was a problem, the formats
   // array will be empty.
   static void GetDeviceSupportedFormats(const Name& device,
                                         VideoCaptureCapabilities* formats);
 
   // Prepare the camera for use. After this function has been called no other
-  // applications can use the camera. StopAndDeAllocate() must be called before
-  // the object is deleted.
-  virtual void AllocateAndStart(const VideoCaptureParams& params,
-                                scoped_ptr<Client> client) = 0;
+  // applications can use the camera. On completion Client::OnFrameInfo()
+  // is called informing of the resulting resolution and frame rate.
+  // StopAndDeAllocate() must be called before the object is deleted.
+  virtual void AllocateAndStart(
+      const VideoCaptureCapability& capture_format,
+      scoped_ptr<Client> client) = 0;
 
   // Deallocates the camera, possibly asynchronously.
   //
   // This call requires the device to do the following things, eventually: put
   // camera hardware into a state where other applications could use it, free
   // the memory associated with capture, and delete the |client| pointer passed
   // into AllocateAndStart.
   //
   // If deallocation is done asynchronously, then the device implementation must
   // ensure that a subsequent AllocateAndStart() operation targeting the same ID
   // would be sequenced through the same task runner, so that deallocation
   // happens first.
   virtual void StopAndDeAllocate() = 0;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_H_