Index: media/video/capture/fake_video_capture_device.h |
diff --git a/media/video/capture/fake_video_capture_device.h b/media/video/capture/fake_video_capture_device.h |
index de1fe3224458c0c50f782a148a760d866da80ee4..5397208c0bcafd6d4845526ff04f63678dc067df 100644 |
--- a/media/video/capture/fake_video_capture_device.h |
+++ b/media/video/capture/fake_video_capture_device.h |
@@ -25,10 +25,11 @@ class MEDIA_EXPORT FakeVideoCaptureDevice : public VideoCaptureDevice { |
// return NULL; |
static void SetFailNextCreate(); |
static void SetNumberOfFakeDevices(size_t number_of_devices); |
+ static int NumberOfFakeDevices(); |
static void GetDeviceNames(Names* device_names); |
static void GetDeviceSupportedFormats(const Name& device, |
- VideoCaptureCapabilities* formats); |
+ VideoCaptureFormats* supported_formats); |
// VideoCaptureDevice implementation. |
virtual void AllocateAndStart(const VideoCaptureParams& params, |
@@ -47,9 +48,6 @@ class MEDIA_EXPORT FakeVideoCaptureDevice : public VideoCaptureDevice { |
// Called on the capture_thread_. |
void OnCaptureTask(); |
- |
- // EXPERIMENTAL, similar to allocate, but changes resolution and calls |
- // client->OnFrameInfoChanged(VideoCaptureCapability&) |
void Reallocate(); |
void PopulateFormatRoster(); |
@@ -65,6 +63,7 @@ class MEDIA_EXPORT FakeVideoCaptureDevice : public VideoCaptureDevice { |
std::vector<VideoCaptureFormat> format_roster_; |
int format_roster_index_; |
+ static int number_of_fake_devices_; |
static bool fail_next_create_; |
// |number_of_devices_| is atomic since tests can call SetNumberOfFakeDevices |
// on the IO thread to set |number_of_devices_|. The variable can be |