diff options
| author | Andreas Huber <andih@google.com> | 2010-06-23 16:40:57 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-06-23 16:40:57 -0700 |
| commit | 8d65dd26530c7559082bd738cf930e2806158ab2 (patch) | |
| tree | 5913164705ac85e30dc983867bc7d4ae31418525 /media/jni | |
| parent | 1e4b9f3936d6f357e89360293e05a0e16d5fa440 (diff) | |
| download | frameworks_base-8d65dd26530c7559082bd738cf930e2806158ab2.zip frameworks_base-8d65dd26530c7559082bd738cf930e2806158ab2.tar.gz frameworks_base-8d65dd26530c7559082bd738cf930e2806158ab2.tar.bz2 | |
Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
Change-Id: Ieafe75a4550c273ad59b4518d7cd4c0fce0f7cce
related-to-bug: 2370115
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/Android.mk | 10 | ||||
| -rw-r--r-- | media/jni/android_media_MediaScanner.cpp | 23 |
2 files changed, 2 insertions, 31 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk index 198e865..6eec215 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -24,6 +24,7 @@ LOCAL_SHARED_LIBRARIES := \ libui \ libcutils \ libsurfaceflinger_client \ + libstagefright \ libcamera_client ifneq ($(BUILD_WITHOUT_PV),true) @@ -34,15 +35,6 @@ else LOCAL_CFLAGS += -DNO_OPENCORE endif -ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) - -LOCAL_CFLAGS += -DBUILD_WITH_FULL_STAGEFRIGHT=1 - -LOCAL_SHARED_LIBRARIES += \ - libstagefright - -endif - LOCAL_STATIC_LIBRARIES := LOCAL_C_INCLUDES += \ diff --git a/media/jni/android_media_MediaScanner.cpp b/media/jni/android_media_MediaScanner.cpp index 2ab2445..273f1af 100644 --- a/media/jni/android_media_MediaScanner.cpp +++ b/media/jni/android_media_MediaScanner.cpp @@ -31,13 +31,7 @@ #include "JNIHelp.h" #include "android_runtime/AndroidRuntime.h" -#ifndef NO_OPENCORE -#include "pvmediascanner.h" -#endif - -#if BUILD_WITH_FULL_STAGEFRIGHT #include <media/stagefright/StagefrightMediaScanner.h> -#endif // ---------------------------------------------------------------------------- @@ -286,25 +280,10 @@ android_media_MediaScanner_native_init(JNIEnv *env) } } -static MediaScanner *createMediaScanner() { -#if BUILD_WITH_FULL_STAGEFRIGHT - char value[PROPERTY_VALUE_MAX]; - if (property_get("media.stagefright.enable-scan", value, NULL) - && (!strcmp(value, "1") || !strcasecmp(value, "true"))) { - return new StagefrightMediaScanner; - } -#endif -#ifndef NO_OPENCORE - return new PVMediaScanner(); -#endif - - return NULL; -} - static void android_media_MediaScanner_native_setup(JNIEnv *env, jobject thiz) { - MediaScanner *mp = createMediaScanner(); + MediaScanner *mp = new StagefrightMediaScanner; if (mp == NULL) { jniThrowException(env, "java/lang/RuntimeException", "Out of memory"); |