Chromium Code Reviews| 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..3952123508e0fa4ab499aa74a7ea32b344b7a0ed 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_; |
| + VideoCaptureDeviceDescriptor device_descriptor_; |
|
mcasas
2016/07/26 23:52:03
nit: can be made const?
chfremer
2016/07/27 23:10:17
Done.
|
| VideoCaptureFormat capture_format_; |
| // Java VideoCaptureAndroid instance. |