Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: media/base/android/media_jni_registrar.cc

Issue 1525003002: Revert of Refactor MediaCodecBridge to add support for NDK APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix rebase errors Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/base/android/media_decoder_job.cc ('k') | media/base/android/media_source_player_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/audio/android/audio_record_input.h" 12 #include "media/audio/android/audio_record_input.h"
13 #include "media/base/android/media_codec_util.h" 13 #include "media/base/android/media_codec_bridge.h"
14 #include "media/base/android/media_drm_bridge.h" 14 #include "media/base/android/media_drm_bridge.h"
15 #include "media/base/android/media_player_bridge.h" 15 #include "media/base/android/media_player_bridge.h"
16 #include "media/base/android/media_player_listener.h" 16 #include "media/base/android/media_player_listener.h"
17 #include "media/base/android/sdk_media_codec_bridge.h"
18 #include "media/base/android/webaudio_media_codec_bridge.h" 17 #include "media/base/android/webaudio_media_codec_bridge.h"
19 #include "media/capture/video/android/video_capture_device_android.h" 18 #include "media/capture/video/android/video_capture_device_android.h"
20 #include "media/capture/video/android/video_capture_device_factory_android.h" 19 #include "media/capture/video/android/video_capture_device_factory_android.h"
21 20
22 namespace media { 21 namespace media {
23 22
24 static base::android::RegistrationMethod kMediaRegisteredMethods[] = { 23 static base::android::RegistrationMethod kMediaRegisteredMethods[] = {
25 {"AudioManagerAndroid", AudioManagerAndroid::RegisterAudioManager}, 24 { "AudioManagerAndroid",
26 {"AudioRecordInput", AudioRecordInputStream::RegisterAudioRecordInput}, 25 AudioManagerAndroid::RegisterAudioManager },
27 {"MediaDrmBridge", MediaDrmBridge::RegisterMediaDrmBridge}, 26 { "AudioRecordInput",
28 {"MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge}, 27 AudioRecordInputStream::RegisterAudioRecordInput },
29 {"MediaPlayerListener", MediaPlayerListener::RegisterMediaPlayerListener}, 28 { "MediaCodecBridge",
30 {"SdkMediaCodecBridge", SdkMediaCodecBridge::RegisterSdkMediaCodecBridge}, 29 MediaCodecBridge::RegisterMediaCodecBridge },
31 {"MediaCodecUtil", MediaCodecUtil::RegisterMediaCodecUtil}, 30 { "MediaDrmBridge",
32 {"VideoCaptureDevice", 31 MediaDrmBridge::RegisterMediaDrmBridge },
33 VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice}, 32 { "MediaPlayerBridge",
34 {"VideoCaptureDeviceFactory", 33 MediaPlayerBridge::RegisterMediaPlayerBridge },
35 VideoCaptureDeviceFactoryAndroid::RegisterVideoCaptureDeviceFactory}, 34 { "MediaPlayerListener",
36 {"WebAudioMediaCodecBridge", 35 MediaPlayerListener::RegisterMediaPlayerListener },
37 WebAudioMediaCodecBridge::RegisterWebAudioMediaCodecBridge}, 36 { "VideoCaptureDevice",
37 VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice },
38 { "VideoCaptureDeviceFactory",
39 VideoCaptureDeviceFactoryAndroid::RegisterVideoCaptureDeviceFactory },
40 { "WebAudioMediaCodecBridge",
41 WebAudioMediaCodecBridge::RegisterWebAudioMediaCodecBridge },
38 }; 42 };
39 43
40 bool RegisterJni(JNIEnv* env) { 44 bool RegisterJni(JNIEnv* env) {
41 return base::android::RegisterNativeMethods( 45 return base::android::RegisterNativeMethods(
42 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); 46 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods));
43 } 47 }
44 48
45 } // namespace media 49 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_decoder_job.cc ('k') | media/base/android/media_source_player_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698