media/base/android/media_jni_registrar.cc - Issue 1472943002: Refactor MediaCodecBridge to add support for NDK APIs

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 1472943002: Refactor MediaCodecBridge to add support for NDK APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add media_codec_util.cc(h) Created 5 years, 1 month 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

« media/base/android/media_codec_util.cc ('K') | « media/base/android/media_codec_video_decoder.cc ('k') | media/base/android/media_source_player_unittest.cc » ('j') | media/base/android/ndk_media_codec_bridge.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 202046987ea1fc81da1419bfb0809fc89aab4f33..e3956b62f21c015f84714b3f09afcdc45371050a 100644

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

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

@@ -10,10 +10,11 @@

#include "media/audio/android/audio_manager_android.h"

#include "media/audio/android/audio_record_input.h"

-#include "media/base/android/media_codec_bridge.h"

+#include "media/base/android/media_codec_util.h"

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

#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/base/android/webaudio_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"

@@ -21,18 +22,13 @@

namespace media {

static base::android::RegistrationMethod kMediaRegisteredMethods[] = {

- { "AudioManagerAndroid",

- AudioManagerAndroid::RegisterAudioManager },

- { "AudioRecordInput",

- AudioRecordInputStream::RegisterAudioRecordInput },

- { "MediaCodecBridge",

- MediaCodecBridge::RegisterMediaCodecBridge },

- { "MediaDrmBridge",

- MediaDrmBridge::RegisterMediaDrmBridge },

- { "MediaPlayerBridge",

- MediaPlayerBridge::RegisterMediaPlayerBridge },

- { "MediaPlayerListener",

- MediaPlayerListener::RegisterMediaPlayerListener },

+ { "AudioManagerAndroid", AudioManagerAndroid::RegisterAudioManager },

+ { "AudioRecordInput", AudioRecordInputStream::RegisterAudioRecordInput },

+ { "MediaDrmBridge", MediaDrmBridge::RegisterMediaDrmBridge },

+ { "MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge },

+ { "MediaPlayerListener", MediaPlayerListener::RegisterMediaPlayerListener },

+ { "SdkMediaCodecBridge", SdkMediaCodecBridge::RegisterSdkMediaCodecBridge },

+ { "MediaCodecUtil", RegisterMediaCodecUtil },

{ "VideoCaptureDevice",

VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice },

{ "VideoCaptureDeviceFactory",