media/base/android/media_jni_registrar.cc - Issue 2178973004: DialogSurfaceManager implementation.

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

Issue 2178973004: DialogSurfaceManager implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: moved jni out of content/app Created 4 years, 4 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

« media/base/android/java/src/org/chromium/media/IDialogSurfaceManager.aidl ('K') | « media/base/android/java/src/org/chromium/media/common.aidl ('k') | media/media.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 #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_manager.h"

13 #include "media/base/android/media_codec_util.h"	14 #include "media/base/android/media_codec_util.h"

14 #include "media/base/android/media_drm_bridge.h"	15 #include "media/base/android/media_drm_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/sdk_media_codec_bridge.h"	18 #include "media/base/android/sdk_media_codec_bridge.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 {"DialogSurfaceManager",

	26 DialogSurfaceManager::RegisterDialogSurfaceManager},

24 {"MediaDrmBridge", MediaDrmBridge::RegisterMediaDrmBridge},	27 {"MediaDrmBridge", MediaDrmBridge::RegisterMediaDrmBridge},

25 {"MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge},	28 {"MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge},

26 {"MediaPlayerListener", MediaPlayerListener::RegisterMediaPlayerListener},	29 {"MediaPlayerListener", MediaPlayerListener::RegisterMediaPlayerListener},

27 {"SdkMediaCodecBridge", SdkMediaCodecBridge::RegisterSdkMediaCodecBridge},	30 {"SdkMediaCodecBridge", SdkMediaCodecBridge::RegisterSdkMediaCodecBridge},

28 {"MediaCodecUtil", MediaCodecUtil::RegisterMediaCodecUtil},	31 {"MediaCodecUtil", MediaCodecUtil::RegisterMediaCodecUtil},

29 };	32 };

30	33

31 bool RegisterJni(JNIEnv* env) {	34 bool RegisterJni(JNIEnv* env) {

32 return base::android::RegisterNativeMethods(	35 return base::android::RegisterNativeMethods(

33 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods));	36 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods));

34 }	37 }

35	38

36 } // namespace media	39 } // namespace media

OLD	NEW