diff options
| author | Andreas Huber <andih@google.com> | 2012-05-02 16:06:09 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-05-03 16:02:29 -0700 |
| commit | 60d610bf103379277a4b29a7ead4f013f6128e4e (patch) | |
| tree | 3bff8658e38cbe8af73dce98e9ab7ac9ba7fb42c /media/jni/android_media_MediaExtractor.cpp | |
| parent | 5380cdc2e1adc8511b05e7623efb44d67be88418 (diff) | |
| download | frameworks_base-60d610bf103379277a4b29a7ead4f013f6128e4e.zip frameworks_base-60d610bf103379277a4b29a7ead4f013f6128e4e.tar.gz frameworks_base-60d610bf103379277a4b29a7ead4f013f6128e4e.tar.bz2 | |
Various changes to Media* APIs requested by the api council.
Change-Id: Iec2f50c99cf5f00a442737231361334e9ab46340
related-to-bug: 6432753
Diffstat (limited to 'media/jni/android_media_MediaExtractor.cpp')
| -rw-r--r-- | media/jni/android_media_MediaExtractor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/jni/android_media_MediaExtractor.cpp b/media/jni/android_media_MediaExtractor.cpp index 9e1920c..c93baf1 100644 --- a/media/jni/android_media_MediaExtractor.cpp +++ b/media/jni/android_media_MediaExtractor.cpp @@ -237,7 +237,7 @@ static void android_media_MediaExtractor_release(JNIEnv *env, jobject thiz) { setMediaExtractor(env, thiz, NULL); } -static jint android_media_MediaExtractor_countTracks( +static jint android_media_MediaExtractor_getTrackCount( JNIEnv *env, jobject thiz) { sp<JMediaExtractor> extractor = getMediaExtractor(env, thiz); @@ -249,7 +249,7 @@ static jint android_media_MediaExtractor_countTracks( return extractor->countTracks(); } -static jobject android_media_MediaExtractor_getTrackFormat( +static jobject android_media_MediaExtractor_getTrackFormatNative( JNIEnv *env, jobject thiz, jint index) { sp<JMediaExtractor> extractor = getMediaExtractor(env, thiz); @@ -669,10 +669,10 @@ static void android_media_MediaExtractor_native_finalize( static JNINativeMethod gMethods[] = { { "release", "()V", (void *)android_media_MediaExtractor_release }, - { "countTracks", "()I", (void *)android_media_MediaExtractor_countTracks }, + { "getTrackCount", "()I", (void *)android_media_MediaExtractor_getTrackCount }, - { "getTrackFormat", "(I)Ljava/util/Map;", - (void *)android_media_MediaExtractor_getTrackFormat }, + { "getTrackFormatNative", "(I)Ljava/util/Map;", + (void *)android_media_MediaExtractor_getTrackFormatNative }, { "selectTrack", "(I)V", (void *)android_media_MediaExtractor_selectTrack }, |