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

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

Issue 14932020: Add Create() function to AudioCodecBridge and VideoCodecBridge to allow return of null pointers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove dependency, remove target in another CL Created 7 years, 7 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
« no previous file with comments | « media/base/android/media_codec_bridge_unittest.cc ('k') | media/base/android/media_source_player.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 9cedfac7e0fbee9ea82eb9cfe0b821b31324c758..93a46c3b5459fd6ac17c1ce00ba2513ce84c13a6 100644
--- a/media/base/android/media_jni_registrar.cc
+++ b/media/base/android/media_jni_registrar.cc
@@ -9,6 +9,7 @@
#include "base/android/jni_registrar.h"
#include "media/audio/android/audio_manager_android.h"
+#include "media/base/android/media_codec_bridge.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"
@@ -19,6 +20,8 @@ namespace media {
static base::android::RegistrationMethod kMediaRegisteredMethods[] = {
{ "AudioManagerAndroid",
AudioManagerAndroid::RegisterAudioManager },
+ { "MediaCodecBridge",
+ MediaCodecBridge::RegisterMediaCodecBridge },
{ "MediaPlayerBridge",
MediaPlayerBridge::RegisterMediaPlayerBridge },
{ "MediaPlayerListener",
« no previous file with comments | « media/base/android/media_codec_bridge_unittest.cc ('k') | media/base/android/media_source_player.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698