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

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

Issue 2466463005: Support (E)AC3 passthrough
Patch Set: Add unit tests Created 3 years, 6 months 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
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/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/audio/android/audio_track_output_stream.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_drm_storage_bridge.h" 15 #include "media/base/android/media_drm_storage_bridge.h"
15 #include "media/base/android/media_player_bridge.h" 16 #include "media/base/android/media_player_bridge.h"
16 #include "media/base/android/media_player_listener.h" 17 #include "media/base/android/media_player_listener.h"
17 #include "media/base/android/media_server_crash_listener.h" 18 #include "media/base/android/media_server_crash_listener.h"
18 19
19 namespace media { 20 namespace media {
20 21
21 static base::android::RegistrationMethod kMediaRegisteredMethods[] = { 22 static base::android::RegistrationMethod kMediaRegisteredMethods[] = {
22 {"AudioManagerAndroid", AudioManagerAndroid::RegisterAudioManager}, 23 {"AudioManagerAndroid", AudioManagerAndroid::RegisterAudioManager},
23 {"AudioRecordInput", AudioRecordInputStream::RegisterAudioRecordInput}, 24 {"AudioRecordInput", AudioRecordInputStream::RegisterAudioRecordInput},
25 {"AudioTrackOutputStream",
26 AudioTrackOutputStream::RegisterAudioTrackOutputStream},
24 {"MediaDrmBridge", MediaDrmBridge::RegisterMediaDrmBridge}, 27 {"MediaDrmBridge", MediaDrmBridge::RegisterMediaDrmBridge},
25 {"MediaDrmStorageBridge", 28 {"MediaDrmStorageBridge",
26 MediaDrmStorageBridge::RegisterMediaDrmStorageBridge}, 29 MediaDrmStorageBridge::RegisterMediaDrmStorageBridge},
27 {"MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge}, 30 {"MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge},
28 {"MediaPlayerListener", MediaPlayerListener::RegisterMediaPlayerListener}, 31 {"MediaPlayerListener", MediaPlayerListener::RegisterMediaPlayerListener},
29 {"MediaServerCrashListener", 32 {"MediaServerCrashListener",
30 MediaServerCrashListener::RegisterMediaServerCrashListener}, 33 MediaServerCrashListener::RegisterMediaServerCrashListener},
31 }; 34 };
32 35
33 bool RegisterJni(JNIEnv* env) { 36 bool RegisterJni(JNIEnv* env) {
34 return base::android::RegisterNativeMethods( 37 return base::android::RegisterNativeMethods(
35 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); 38 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods));
36 } 39 }
37 40
38 } // namespace media 41 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698