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/dialog_surface_callback.h" |
| 14 #include "media/base/android/media_codec_util.h" |
13 #include "media/base/android/media_drm_bridge.h" | 15 #include "media/base/android/media_drm_bridge.h" |
14 #include "media/base/android/media_player_bridge.h" | 16 #include "media/base/android/media_player_bridge.h" |
15 #include "media/base/android/media_player_listener.h" | 17 #include "media/base/android/media_player_listener.h" |
16 | 18 |
17 namespace media { | 19 namespace media { |
18 | 20 |
19 static base::android::RegistrationMethod kMediaRegisteredMethods[] = { | 21 static base::android::RegistrationMethod kMediaRegisteredMethods[] = { |
20 {"AudioManagerAndroid", AudioManagerAndroid::RegisterAudioManager}, | 22 {"AudioManagerAndroid", AudioManagerAndroid::RegisterAudioManager}, |
21 {"AudioRecordInput", AudioRecordInputStream::RegisterAudioRecordInput}, | 23 {"AudioRecordInput", AudioRecordInputStream::RegisterAudioRecordInput}, |
| 24 {"DialogSurfaceCallback", |
| 25 DialogSurfaceCallback::RegisterDialogSurfaceCallback}, |
22 {"MediaDrmBridge", MediaDrmBridge::RegisterMediaDrmBridge}, | 26 {"MediaDrmBridge", MediaDrmBridge::RegisterMediaDrmBridge}, |
23 {"MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge}, | 27 {"MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge}, |
24 {"MediaPlayerListener", MediaPlayerListener::RegisterMediaPlayerListener}, | 28 {"MediaPlayerListener", MediaPlayerListener::RegisterMediaPlayerListener}, |
25 }; | 29 }; |
26 | 30 |
27 bool RegisterJni(JNIEnv* env) { | 31 bool RegisterJni(JNIEnv* env) { |
28 return base::android::RegisterNativeMethods( | 32 return base::android::RegisterNativeMethods( |
29 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); | 33 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); |
30 } | 34 } |
31 | 35 |
32 } // namespace media | 36 } // namespace media |
OLD | NEW |