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

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

Issue 1967553002: DO NOT COMMIT - DialogSurface initial implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added check for gpu process for dialog surface manager. Created 4 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/base/android/dialog_surface_callback.h"
14 #include "media/base/android/dialog_surface_controller.h"
15 #include "media/base/android/dialog_surface_manager.h"
13 #include "media/base/android/media_codec_util.h" 16 #include "media/base/android/media_codec_util.h"
14 #include "media/base/android/media_drm_bridge.h" 17 #include "media/base/android/media_drm_bridge.h"
15 #include "media/base/android/media_player_bridge.h" 18 #include "media/base/android/media_player_bridge.h"
16 #include "media/base/android/media_player_listener.h" 19 #include "media/base/android/media_player_listener.h"
17 #include "media/base/android/sdk_media_codec_bridge.h" 20 #include "media/base/android/sdk_media_codec_bridge.h"
18 21
19 namespace media { 22 namespace media {
20 23
21 static base::android::RegistrationMethod kMediaRegisteredMethods[] = { 24 static base::android::RegistrationMethod kMediaRegisteredMethods[] = {
22 {"AudioManagerAndroid", AudioManagerAndroid::RegisterAudioManager}, 25 {"AudioManagerAndroid", AudioManagerAndroid::RegisterAudioManager},
23 {"AudioRecordInput", AudioRecordInputStream::RegisterAudioRecordInput}, 26 {"AudioRecordInput", AudioRecordInputStream::RegisterAudioRecordInput},
27 {"DialogSurfaceCallback",
28 DialogSurfaceCallback::RegisterDialogSurfaceCallback},
29 {"DialogSurfaceController",
30 DialogSurfaceController::RegisterDialogSurfaceController},
31 {"DialogSurfaceManager",
32 DialogSurfaceManager::RegisterDialogSurfaceManager},
24 {"MediaDrmBridge", MediaDrmBridge::RegisterMediaDrmBridge}, 33 {"MediaDrmBridge", MediaDrmBridge::RegisterMediaDrmBridge},
25 {"MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge}, 34 {"MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge},
26 {"MediaPlayerListener", MediaPlayerListener::RegisterMediaPlayerListener}, 35 {"MediaPlayerListener", MediaPlayerListener::RegisterMediaPlayerListener},
27 {"SdkMediaCodecBridge", SdkMediaCodecBridge::RegisterSdkMediaCodecBridge}, 36 {"SdkMediaCodecBridge", SdkMediaCodecBridge::RegisterSdkMediaCodecBridge},
28 {"MediaCodecUtil", MediaCodecUtil::RegisterMediaCodecUtil}, 37 {"MediaCodecUtil", MediaCodecUtil::RegisterMediaCodecUtil},
29 }; 38 };
30 39
31 bool RegisterJni(JNIEnv* env) { 40 bool RegisterJni(JNIEnv* env) {
32 return base::android::RegisterNativeMethods( 41 return base::android::RegisterNativeMethods(
33 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); 42 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods));
34 } 43 }
35 44
36 } // namespace media 45 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698