OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ | 5 #ifndef MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ |
6 #define MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ | 6 #define MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ |
7 | 7 |
8 #include "media/video/capture/video_capture_device_factory.h" | 8 #include "media/video/capture/video_capture_device_factory.h" |
9 | 9 |
10 #include <jni.h> | 10 #include <jni.h> |
(...skipping 16 matching lines...) Expand all Loading... |
27 }; | 27 }; |
28 static bool RegisterVideoCaptureDeviceFactory(JNIEnv* env); | 28 static bool RegisterVideoCaptureDeviceFactory(JNIEnv* env); |
29 static base::android::ScopedJavaLocalRef<jobject> createVideoCaptureAndroid( | 29 static base::android::ScopedJavaLocalRef<jobject> createVideoCaptureAndroid( |
30 int id, | 30 int id, |
31 jlong nativeVideoCaptureDeviceAndroid); | 31 jlong nativeVideoCaptureDeviceAndroid); |
32 | 32 |
33 VideoCaptureDeviceFactoryAndroid() {} | 33 VideoCaptureDeviceFactoryAndroid() {} |
34 virtual ~VideoCaptureDeviceFactoryAndroid() {} | 34 virtual ~VideoCaptureDeviceFactoryAndroid() {} |
35 | 35 |
36 virtual scoped_ptr<VideoCaptureDevice> Create( | 36 virtual scoped_ptr<VideoCaptureDevice> Create( |
| 37 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
37 const VideoCaptureDevice::Name& device_name) OVERRIDE; | 38 const VideoCaptureDevice::Name& device_name) OVERRIDE; |
38 virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) OVERRIDE; | 39 virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) OVERRIDE; |
39 virtual void GetDeviceSupportedFormats( | 40 virtual void GetDeviceSupportedFormats( |
40 const VideoCaptureDevice::Name& device, | 41 const VideoCaptureDevice::Name& device, |
41 VideoCaptureFormats* supported_formats) OVERRIDE; | 42 VideoCaptureFormats* supported_formats) OVERRIDE; |
42 | 43 |
43 private: | 44 private: |
44 | 45 |
45 DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid);}; | 46 DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid);}; |
46 } // namespace media | 47 } // namespace media |
47 | 48 |
48 #endif // MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ | 49 #endif // MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ |
OLD | NEW |