OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/base/android/media_jni_registrar.h" | 5 #include "media/base/android/media_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/audio/android/audio_manager_android.h" | 11 #include "media/audio/android/audio_manager_android.h" |
12 #include "media/audio/android/audio_record_input.h" | 12 #include "media/audio/android/audio_record_input.h" |
| 13 #include "media/base/android/android_overlay_callback.h" |
13 #include "media/base/android/media_drm_bridge.h" | 14 #include "media/base/android/media_drm_bridge.h" |
14 #include "media/base/android/media_player_bridge.h" | 15 #include "media/base/android/media_player_bridge.h" |
15 #include "media/base/android/media_player_listener.h" | 16 #include "media/base/android/media_player_listener.h" |
16 #include "media/base/android/media_server_crash_listener.h" | 17 #include "media/base/android/media_server_crash_listener.h" |
17 | 18 |
18 namespace media { | 19 namespace media { |
19 | 20 |
20 static base::android::RegistrationMethod kMediaRegisteredMethods[] = { | 21 static base::android::RegistrationMethod kMediaRegisteredMethods[] = { |
21 {"AudioManagerAndroid", AudioManagerAndroid::RegisterAudioManager}, | 22 {"AudioManagerAndroid", AudioManagerAndroid::RegisterAudioManager}, |
22 {"AudioRecordInput", AudioRecordInputStream::RegisterAudioRecordInput}, | 23 {"AudioRecordInput", AudioRecordInputStream::RegisterAudioRecordInput}, |
| 24 {"AndroidOverlayCallback", |
| 25 AndroidOverlayCallback::RegisterAndroidOverlayCallback}, |
23 {"MediaDrmBridge", MediaDrmBridge::RegisterMediaDrmBridge}, | 26 {"MediaDrmBridge", MediaDrmBridge::RegisterMediaDrmBridge}, |
24 {"MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge}, | 27 {"MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge}, |
25 {"MediaPlayerListener", MediaPlayerListener::RegisterMediaPlayerListener}, | 28 {"MediaPlayerListener", MediaPlayerListener::RegisterMediaPlayerListener}, |
26 {"MediaServerCrashListener", | 29 {"MediaServerCrashListener", |
27 MediaServerCrashListener::RegisterMediaServerCrashListener}, | 30 MediaServerCrashListener::RegisterMediaServerCrashListener}, |
28 }; | 31 }; |
29 | 32 |
30 bool RegisterJni(JNIEnv* env) { | 33 bool RegisterJni(JNIEnv* env) { |
31 return base::android::RegisterNativeMethods( | 34 return base::android::RegisterNativeMethods( |
32 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); | 35 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); |
33 } | 36 } |
34 | 37 |
35 } // namespace media | 38 } // namespace media |
OLD | NEW |