Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15149f2e authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 0d964c94: am a2549bb6: Merge "Remove most stagefright property overrides,... 

am 0d964c94: am a2549bb6: Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread

Merge commit '0d964c94'

* commit '0d964c94':
  Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
parents abe9e69c 0d964c94

cmds/stagefright/Android.mk

+0 −4
Original line number Diff line number Diff line 
ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true)



LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)
@@ -72,5 +70,3 @@ LOCAL_MODULE_TAGS := debug 
LOCAL_MODULE:= audioloop



include $(BUILD_EXECUTABLE)
 


endif

include/media/MediaPlayerInterface.h

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ template<typename T> class SortedVector; 
enum player_type {

    PV_PLAYER = 1,

    SONIVOX_PLAYER = 2,

    VORBIS_PLAYER = 3,

    STAGEFRIGHT_PLAYER = 4,

    // Test players are available only in the 'test' and 'eng' builds.

    // The shared library with the test player is passed passed as an

media/jni/Android.mk

+1 −9
Original line number Diff line number Diff line
@@ -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 += \

media/jni/android_media_MediaScanner.cpp

+1 −22
Original line number Diff line number Diff line
@@ -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");

media/libmediaplayerservice/Android.mk

+3 −13
Original line number Diff line number Diff line
@@ -11,21 +11,11 @@ LOCAL_SRC_FILES:= \ 
    MediaPlayerService.cpp      \

    MetadataRetrieverClient.cpp \

    TestPlayerStub.cpp          \

    VorbisPlayer.cpp            \

    VorbisMetadataRetriever.cpp \

    MidiMetadataRetriever.cpp   \

    MidiFile.cpp



ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true)



LOCAL_SRC_FILES +=                      \

    MidiFile.cpp                \

    StagefrightPlayer.cpp       \

    StagefrightRecorder.cpp



LOCAL_CFLAGS += -DBUILD_WITH_FULL_STAGEFRIGHT=1



endif



ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)

LOCAL_LDLIBS += -ldl -lpthread

endif