media/base/android/media_jni_registrar.cc - Issue 1714913002: Reland: Move VideoCapture* files from media/base/android/... to media/capture/video/android/java/...

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

Unified Diff: media/base/android/media_jni_registrar.cc

Issue 1714913002: Reland: Move VideoCapture* files from media/base/android/... to media/capture/video/android/java/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: gyp-gn files and added a capture_jni_registrar Created 4 years, 10 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 side-by-side diff with in-line comments

Download patch

Index: media/base/android/media_jni_registrar.cc

diff --git a/media/base/android/media_jni_registrar.cc b/media/base/android/media_jni_registrar.cc

index e230784423df8dbea8441b29d6b3bd2c45acfab9..3ef0f7550ff4a2d5f3245abbc847523d4ac77270 100644

--- a/media/base/android/media_jni_registrar.cc

+++ b/media/base/android/media_jni_registrar.cc

@@ -15,8 +15,6 @@

#include "media/base/android/media_player_bridge.h"

#include "media/base/android/media_player_listener.h"

#include "media/base/android/sdk_media_codec_bridge.h"

-#include "media/capture/video/android/video_capture_device_android.h"

-#include "media/capture/video/android/video_capture_device_factory_android.h"

namespace media {

@@ -28,10 +26,6 @@ static base::android::RegistrationMethod kMediaRegisteredMethods[] = {

{"MediaPlayerListener", MediaPlayerListener::RegisterMediaPlayerListener},

{"SdkMediaCodecBridge", SdkMediaCodecBridge::RegisterSdkMediaCodecBridge},

{"MediaCodecUtil", MediaCodecUtil::RegisterMediaCodecUtil},

- {"VideoCaptureDevice",

- VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice},

- {"VideoCaptureDeviceFactory",

- VideoCaptureDeviceFactoryAndroid::RegisterVideoCaptureDeviceFactory},

};

bool RegisterJni(JNIEnv* env) {

« no previous file with comments | « media/base/android/java/src/org/chromium/media/VideoCaptureTango.java ('k') | media/base/run_all_unittests.cc » ('j') | no next file with comments »