Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Side by Side Diff: media/capture/video/android/video_capture_device_factory_android.h

Issue 2199913003: media: Remove unneeded RegisterNatives() call (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@jnireg1
Patch Set: rebase Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ 5 #ifndef MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
6 #define MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ 6 #define MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
7 7
8 #include "media/capture/video/video_capture_device_factory.h" 8 #include "media/capture/video/video_capture_device_factory.h"
9 9
10 #include <jni.h> 10 #include <jni.h>
11 11
12 #include "base/android/scoped_java_ref.h" 12 #include "base/android/scoped_java_ref.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "media/capture/video/video_capture_device.h" 14 #include "media/capture/video/video_capture_device.h"
15 15
16 namespace media { 16 namespace media {
17 17
18 // VideoCaptureDeviceFactory on Android. This class implements the static 18 // VideoCaptureDeviceFactory on Android. This class implements the static
19 // VideoCapture methods and the factory of VideoCaptureAndroid. 19 // VideoCapture methods and the factory of VideoCaptureAndroid.
20 class CAPTURE_EXPORT VideoCaptureDeviceFactoryAndroid 20 class CAPTURE_EXPORT VideoCaptureDeviceFactoryAndroid
21 : public VideoCaptureDeviceFactory { 21 : public VideoCaptureDeviceFactory {
22 public: 22 public:
23 static bool RegisterVideoCaptureDeviceFactory(JNIEnv* env);
24 static base::android::ScopedJavaLocalRef<jobject> createVideoCaptureAndroid( 23 static base::android::ScopedJavaLocalRef<jobject> createVideoCaptureAndroid(
25 int id, 24 int id,
26 jlong nativeVideoCaptureDeviceAndroid); 25 jlong nativeVideoCaptureDeviceAndroid);
27 26
28 VideoCaptureDeviceFactoryAndroid() {} 27 VideoCaptureDeviceFactoryAndroid() {}
29 ~VideoCaptureDeviceFactoryAndroid() override {} 28 ~VideoCaptureDeviceFactoryAndroid() override {}
30 29
31 std::unique_ptr<VideoCaptureDevice> CreateDevice( 30 std::unique_ptr<VideoCaptureDevice> CreateDevice(
32 const VideoCaptureDeviceDescriptor& device_descriptor) override; 31 const VideoCaptureDeviceDescriptor& device_descriptor) override;
33 void GetDeviceDescriptors( 32 void GetDeviceDescriptors(
34 VideoCaptureDeviceDescriptors* device_descriptors) override; 33 VideoCaptureDeviceDescriptors* device_descriptors) override;
35 void GetSupportedFormats(const VideoCaptureDeviceDescriptor& device, 34 void GetSupportedFormats(const VideoCaptureDeviceDescriptor& device,
36 VideoCaptureFormats* supported_formats) override; 35 VideoCaptureFormats* supported_formats) override;
37 36
38 private: 37 private:
39 DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid); 38 DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid);
40 }; 39 };
41 } // namespace media 40 } // namespace media
42 41
43 #endif // MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ 42 #endif // MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
OLDNEW
« no previous file with comments | « media/capture/video/android/photo_capabilities.cc ('k') | media/capture/video/android/video_capture_device_factory_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698