| 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/base/android/media_player_bridge.h" | 11 #include "media/base/android/media_player_bridge.h" |
| 12 #include "media/base/android/media_player_listener.h" | 12 #include "media/base/android/media_player_listener.h" |
| 13 #include "media/video/capture/android/video_capture_device_android.h" |
| 13 | 14 |
| 14 namespace media { | 15 namespace media { |
| 15 | 16 |
| 16 static base::android::RegistrationMethod kMediaRegisteredMethods[] = { | 17 static base::android::RegistrationMethod kMediaRegisteredMethods[] = { |
| 17 { "MediaPlayerBridge", | 18 { "MediaPlayerBridge", |
| 18 MediaPlayerBridge::RegisterMediaPlayerBridge }, | 19 MediaPlayerBridge::RegisterMediaPlayerBridge }, |
| 19 { "MediaPlayerListener", | 20 { "MediaPlayerListener", |
| 20 MediaPlayerListener::RegisterMediaPlayerListener }, | 21 MediaPlayerListener::RegisterMediaPlayerListener }, |
| 22 { "VideoCaptureDevice", |
| 23 VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice }, |
| 21 }; | 24 }; |
| 22 | 25 |
| 23 bool RegisterJni(JNIEnv* env) { | 26 bool RegisterJni(JNIEnv* env) { |
| 24 return base::android::RegisterNativeMethods( | 27 return base::android::RegisterNativeMethods( |
| 25 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); | 28 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); |
| 26 } | 29 } |
| 27 | 30 |
| 28 } // namespace media | 31 } // namespace media |
| OLD | NEW |