diff options
author | Ronghua Wu <ronghuawu@google.com> | 2015-03-25 10:53:04 -0700 |
---|---|---|
committer | Ronghua Wu <ronghuawu@google.com> | 2015-04-13 11:26:07 -0700 |
commit | ee2997577db8d9e3e52593b9ca454386f703d710 (patch) | |
tree | b96cffff6d4c9552bc7e8fec515b0c0839af8716 /media/jni | |
parent | 738154ee84a37a27e57b8ecca70d3c943728327d (diff) | |
download | frameworks_base-ee2997577db8d9e3e52593b9ca454386f703d710.zip frameworks_base-ee2997577db8d9e3e52593b9ca454386f703d710.tar.gz frameworks_base-ee2997577db8d9e3e52593b9ca454386f703d710.tar.bz2 |
media: add CodecCapabilities.getMaxSupportedInstances.
Bug: 19620911
Change-Id: I11a55121490eba5027498a27c7719133acd1a39a
Diffstat (limited to 'media/jni')
-rw-r--r-- | media/jni/android_media_MediaCodecList.cpp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/media/jni/android_media_MediaCodecList.cpp b/media/jni/android_media_MediaCodecList.cpp index f8c349b..82dd48d 100644 --- a/media/jni/android_media_MediaCodecList.cpp +++ b/media/jni/android_media_MediaCodecList.cpp @@ -262,6 +262,27 @@ static jobject android_media_MediaCodecList_getCodecCapabilities( return caps; } +static jobject android_media_MediaCodecList_getGlobalSettings(JNIEnv *env, jobject /* thiz */) { + sp<IMediaCodecList> mcl = getCodecList(env); + if (mcl == NULL) { + // Runtime exception already pending. + return NULL; + } + + const sp<AMessage> settings = mcl->getGlobalSettings(); + if (settings == NULL) { + jniThrowException(env, "java/lang/RuntimeException", "cannot get global settings"); + return NULL; + } + + jobject settingsObj = NULL; + if (ConvertMessageToMap(env, settings, &settingsObj)) { + return NULL; + } + + return settingsObj; +} + static void android_media_MediaCodecList_native_init(JNIEnv* /* env */) { } @@ -277,6 +298,10 @@ static JNINativeMethod gMethods[] = { "(ILjava/lang/String;)Landroid/media/MediaCodecInfo$CodecCapabilities;", (void *)android_media_MediaCodecList_getCodecCapabilities }, + { "native_getGlobalSettings", + "()Ljava/util/Map;", + (void *)android_media_MediaCodecList_getGlobalSettings }, + { "findCodecByName", "(Ljava/lang/String;)I", (void *)android_media_MediaCodecList_findCodecByName }, |