| 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 | 10 |
| 10 #include "media/audio/android/audio_manager_android.h" | 11 #include "media/audio/android/audio_manager_android.h" |
| 11 #include "media/audio/android/audio_record_input.h" | 12 #include "media/audio/android/audio_record_input.h" |
| 12 #include "media/base/android/media_codec_util.h" | 13 #include "media/base/android/media_codec_util.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/sdk_media_codec_bridge.h" | 17 #include "media/base/android/sdk_media_codec_bridge.h" |
| 17 #include "media/base/android/webaudio_media_codec_bridge.h" | 18 #include "media/base/android/webaudio_media_codec_bridge.h" |
| 18 #include "media/capture/video/android/video_capture_device_android.h" | 19 #include "media/capture/video/android/video_capture_device_android.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 35 {"WebAudioMediaCodecBridge", | 36 {"WebAudioMediaCodecBridge", |
| 36 WebAudioMediaCodecBridge::RegisterWebAudioMediaCodecBridge}, | 37 WebAudioMediaCodecBridge::RegisterWebAudioMediaCodecBridge}, |
| 37 }; | 38 }; |
| 38 | 39 |
| 39 bool RegisterJni(JNIEnv* env) { | 40 bool RegisterJni(JNIEnv* env) { |
| 40 return base::android::RegisterNativeMethods( | 41 return base::android::RegisterNativeMethods( |
| 41 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); | 42 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); |
| 42 } | 43 } |
| 43 | 44 |
| 44 } // namespace media | 45 } // namespace media |
| OLD | NEW |