device/capture/video/android/capture_jni_registrar.cc - Issue 2143903003: [WIP] Move media/capture to device/capture

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: device/capture/video/android/capture_jni_registrar.cc

Issue 2143903003: [WIP] Move media/capture to device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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 #include "media/capture/video/android/capture_jni_registrar.h"	5 #include "device/capture/video/android/capture_jni_registrar.h"

6	6

7 #include "base/android/jni_android.h"	7 #include "base/android/jni_android.h"

8 #include "base/android/jni_registrar.h"	8 #include "base/android/jni_registrar.h"

9 #include "base/macros.h"	9 #include "base/macros.h"

10	10

11 #include "media/capture/video/android/photo_capabilities.h"	11 #include "device/capture/video/android/photo_capabilities.h"

12 #include "media/capture/video/android/video_capture_device_android.h"	12 #include "device/capture/video/android/video_capture_device_android.h"

13 #include "media/capture/video/android/video_capture_device_factory_android.h"	13 #include "device/capture/video/android/video_capture_device_factory_android.h"

14	14

15 namespace media {	15 namespace media {

16	16

17 static base::android::RegistrationMethod kCaptureRegisteredMethods[] = {	17 static base::android::RegistrationMethod kCaptureRegisteredMethods[] = {

18 {"PhotoCapabilities", PhotoCapabilities::RegisterPhotoCapabilities},	18 {"PhotoCapabilities", PhotoCapabilities::RegisterPhotoCapabilities},

19 {"VideoCaptureDevice",	19 {"VideoCaptureDevice",

20 VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice},	20 VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice},

21 {"VideoCaptureDeviceFactory",	21 {"VideoCaptureDeviceFactory",

22 VideoCaptureDeviceFactoryAndroid::RegisterVideoCaptureDeviceFactory},	22 VideoCaptureDeviceFactoryAndroid::RegisterVideoCaptureDeviceFactory},

23 };	23 };

24	24

25 bool RegisterCaptureJni(JNIEnv* env) {	25 bool RegisterCaptureJni(JNIEnv* env) {

26 return base::android::RegisterNativeMethods(	26 return base::android::RegisterNativeMethods(

27 env, kCaptureRegisteredMethods, arraysize(kCaptureRegisteredMethods));	27 env, kCaptureRegisteredMethods, arraysize(kCaptureRegisteredMethods));

28 }	28 }

29	29

30 } // namespace media	30 } // namespace media

OLD	NEW