| Index: media/capture/video/android/video_capture_device_factory_android.h
|
| diff --git a/media/capture/video/android/video_capture_device_factory_android.h b/media/capture/video/android/video_capture_device_factory_android.h
|
| index aa1f36693ce6895edcefdaef833c06b0e0238967..e3208f7c9e964c2f19b5f6bfc501e03c92ecc0cb 100644
|
| --- a/media/capture/video/android/video_capture_device_factory_android.h
|
| +++ b/media/capture/video/android/video_capture_device_factory_android.h
|
| @@ -28,12 +28,12 @@ class CAPTURE_EXPORT VideoCaptureDeviceFactoryAndroid
|
| VideoCaptureDeviceFactoryAndroid() {}
|
| ~VideoCaptureDeviceFactoryAndroid() override {}
|
|
|
| - std::unique_ptr<VideoCaptureDevice> Create(
|
| - const VideoCaptureDevice::Name& device_name) override;
|
| - void GetDeviceNames(VideoCaptureDevice::Names* device_names) override;
|
| - void GetDeviceSupportedFormats(
|
| - const VideoCaptureDevice::Name& device,
|
| - VideoCaptureFormats* supported_formats) override;
|
| + std::unique_ptr<VideoCaptureDevice> CreateDevice(
|
| + const VideoCaptureDeviceDescriptor& device_descriptor) override;
|
| + void GetDeviceDescriptors(
|
| + VideoCaptureDeviceDescriptors* device_descriptors) override;
|
| + void GetSupportedFormats(const VideoCaptureDeviceDescriptor& device,
|
| + VideoCaptureFormats* supported_formats) override;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid);
|
|
|