media/base/android/media_jni_registrar.cc - Issue 12457043: Android implementation of WebAudio audio file decoder

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 12457043: Android implementation of WebAudio audio file decoder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java ('K') | « media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java ('k') | media/base/android/webaudio_media_codec_bridge.h » ('j') | media/base/android/webaudio_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 3a4ac82d11cd602755e90e335dbfb7d97d90abd3..db340aa501ae9a86d5036adc3c8c462392f134fb 100644

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

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

@@ -11,6 +11,7 @@

#include "media/audio/audio_manager_base.h"

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

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

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

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

namespace media {

@@ -22,8 +23,8 @@ static base::android::RegistrationMethod kMediaRegisteredMethods[] = {

MediaPlayerBridge::RegisterMediaPlayerBridge },

{ "MediaPlayerListener",

MediaPlayerListener::RegisterMediaPlayerListener },

- { "VideoCaptureDevice",

- VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice },

palmer 2013/04/02 18:01:08 So we no longer use VideoCaptureDevice?

Raymond Toy (Google) 2013/04/02 21:52:21 Oops. This should not have been removed and I fix

Raymond Toy (Google) 2013/04/02 22:07:39 Something is wrong here. My local sources have Vi

+ { "WebAudioMediaCodecBridge",

+ WebAudioMediaCodecBridge::RegisterWebAudioMediaCodecBridge },

};

bool RegisterJni(JNIEnv* env) {