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/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
9 #include "base/android/jni_registrar.h" | 9 #include "base/android/jni_registrar.h" |
10 | 10 |
11 #include "media/audio/android/audio_manager_android.h" | 11 #include "media/audio/android/audio_manager_android.h" |
| 12 #include "media/base/android/media_codec_bridge.h" |
12 #include "media/base/android/media_player_bridge.h" | 13 #include "media/base/android/media_player_bridge.h" |
13 #include "media/base/android/media_player_listener.h" | 14 #include "media/base/android/media_player_listener.h" |
14 #include "media/base/android/webaudio_media_codec_bridge.h" | 15 #include "media/base/android/webaudio_media_codec_bridge.h" |
15 #include "media/video/capture/android/video_capture_device_android.h" | 16 #include "media/video/capture/android/video_capture_device_android.h" |
16 | 17 |
17 namespace media { | 18 namespace media { |
18 | 19 |
19 static base::android::RegistrationMethod kMediaRegisteredMethods[] = { | 20 static base::android::RegistrationMethod kMediaRegisteredMethods[] = { |
20 { "AudioManagerAndroid", | 21 { "AudioManagerAndroid", |
21 AudioManagerAndroid::RegisterAudioManager }, | 22 AudioManagerAndroid::RegisterAudioManager }, |
| 23 { "MediaCodecBridge", |
| 24 MediaCodecBridge::RegisterMediaCodecBridge }, |
22 { "MediaPlayerBridge", | 25 { "MediaPlayerBridge", |
23 MediaPlayerBridge::RegisterMediaPlayerBridge }, | 26 MediaPlayerBridge::RegisterMediaPlayerBridge }, |
24 { "MediaPlayerListener", | 27 { "MediaPlayerListener", |
25 MediaPlayerListener::RegisterMediaPlayerListener }, | 28 MediaPlayerListener::RegisterMediaPlayerListener }, |
26 { "VideoCaptureDevice", | 29 { "VideoCaptureDevice", |
27 VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice }, | 30 VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice }, |
28 { "WebAudioMediaCodecBridge", | 31 { "WebAudioMediaCodecBridge", |
29 WebAudioMediaCodecBridge::RegisterWebAudioMediaCodecBridge }, | 32 WebAudioMediaCodecBridge::RegisterWebAudioMediaCodecBridge }, |
30 }; | 33 }; |
31 | 34 |
32 bool RegisterJni(JNIEnv* env) { | 35 bool RegisterJni(JNIEnv* env) { |
33 return base::android::RegisterNativeMethods( | 36 return base::android::RegisterNativeMethods( |
34 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); | 37 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); |
35 } | 38 } |
36 | 39 |
37 } // namespace media | 40 } // namespace media |
OLD | NEW |