| Index: media/capture/video/android/video_capture_device_android.h
|
| diff --git a/media/capture/video/android/video_capture_device_android.h b/media/capture/video/android/video_capture_device_android.h
|
| index 8845c33e740fbbb2a701ad18e457b14c3beee853..54f4eca111c4d0c5da934ab4f08ab861557108a0 100644
|
| --- a/media/capture/video/android/video_capture_device_android.h
|
| +++ b/media/capture/video/android/video_capture_device_android.h
|
| @@ -41,10 +41,12 @@ class CAPTURE_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {
|
| ANDROID_IMAGE_FORMAT_UNKNOWN = 0,
|
| };
|
|
|
| - explicit VideoCaptureDeviceAndroid(const Name& device_name);
|
| + explicit VideoCaptureDeviceAndroid(
|
| + const VideoCaptureDeviceDescriptor& device_descriptor);
|
| ~VideoCaptureDeviceAndroid() override;
|
|
|
| - static VideoCaptureDevice* Create(const Name& device_name);
|
| + static VideoCaptureDevice* Create(
|
| + const VideoCaptureDeviceDescriptor& device_descriptor);
|
| static bool RegisterVideoCaptureDevice(JNIEnv* env);
|
|
|
| // Registers the Java VideoCaptureDevice pointer, used by the rest of the
|
| @@ -119,7 +121,7 @@ class CAPTURE_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {
|
|
|
| gfx::Size next_photo_resolution_;
|
|
|
| - Name device_name_;
|
| + const VideoCaptureDeviceDescriptor device_descriptor_;
|
| VideoCaptureFormat capture_format_;
|
|
|
| // Java VideoCaptureAndroid instance.
|
|
|