diff options
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/Android.mk | 90 | ||||
-rw-r--r-- | media/libstagefright/OMXCodec.cpp | 2 | ||||
-rw-r--r-- | media/libstagefright/id3/Android.mk | 4 | ||||
-rw-r--r-- | media/libstagefright/omx/tests/Android.mk | 6 |
4 files changed, 37 insertions, 65 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 00a6995..60d0233 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -3,51 +3,44 @@ include $(CLEAR_VARS) include frameworks/base/media/libstagefright/codecs/common/Config.mk -LOCAL_SRC_FILES:= \ - ESDS.cpp \ - MediaBuffer.cpp \ - MediaBufferGroup.cpp \ - MediaDefs.cpp \ - MediaSource.cpp \ - MetaData.cpp \ - OMXCodec.cpp \ - Utils.cpp \ - OMXClient.cpp - -ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) - -LOCAL_SRC_FILES += \ - AMRExtractor.cpp \ - AMRWriter.cpp \ - AudioPlayer.cpp \ - AudioSource.cpp \ - AwesomePlayer.cpp \ - CameraSource.cpp \ - DataSource.cpp \ - FileSource.cpp \ - HTTPStream.cpp \ - JPEGSource.cpp \ - MP3Extractor.cpp \ - MPEG4Extractor.cpp \ - MPEG4Writer.cpp \ - MediaExtractor.cpp \ - NuCachedSource2.cpp \ - NuHTTPDataSource.cpp \ - OggExtractor.cpp \ - SampleIterator.cpp \ - SampleTable.cpp \ - ShoutcastSource.cpp \ - StagefrightMediaScanner.cpp \ - StagefrightMetadataRetriever.cpp \ - ThrottledSource.cpp \ - TimeSource.cpp \ - TimedEventQueue.cpp \ - WAVExtractor.cpp \ +LOCAL_SRC_FILES:= \ + AMRExtractor.cpp \ + AMRWriter.cpp \ + AudioPlayer.cpp \ + AudioSource.cpp \ + AwesomePlayer.cpp \ + CameraSource.cpp \ + DataSource.cpp \ + ESDS.cpp \ + FileSource.cpp \ + HTTPStream.cpp \ + JPEGSource.cpp \ + MP3Extractor.cpp \ + MPEG4Extractor.cpp \ + MPEG4Writer.cpp \ + MediaBuffer.cpp \ + MediaBufferGroup.cpp \ + MediaDefs.cpp \ + MediaExtractor.cpp \ + MediaSource.cpp \ + MetaData.cpp \ + NuCachedSource2.cpp \ + NuHTTPDataSource.cpp \ + OMXClient.cpp \ + OMXCodec.cpp \ + OggExtractor.cpp \ + SampleIterator.cpp \ + SampleTable.cpp \ + ShoutcastSource.cpp \ + StagefrightMediaScanner.cpp \ + StagefrightMetadataRetriever.cpp \ + ThrottledSource.cpp \ + TimeSource.cpp \ + TimedEventQueue.cpp \ + Utils.cpp \ + WAVExtractor.cpp \ string.cpp -LOCAL_CFLAGS += -DBUILD_WITH_FULL_STAGEFRIGHT -endif - LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \ @@ -82,20 +75,13 @@ LOCAL_STATIC_LIBRARIES := \ libstagefright_mpeg2ts \ libstagefright_httplive \ libstagefright_rtsp \ + libstagefright_id3 \ LOCAL_SHARED_LIBRARIES += \ libstagefright_amrnb_common \ libstagefright_enc_common \ libstagefright_avc_common \ libstagefright_foundation \ - -ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) - - -LOCAL_STATIC_LIBRARIES += \ - libstagefright_id3 - -LOCAL_SHARED_LIBRARIES += \ libstagefright_color_conversion ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) @@ -108,8 +94,6 @@ ifneq ($(TARGET_SIMULATOR),true) LOCAL_SHARED_LIBRARIES += libdl endif -endif - ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) LOCAL_LDLIBS += -lpthread endif diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 8979c3b..02a073e 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -425,7 +425,6 @@ sp<MediaSource> OMXCodec::Create( for (size_t i = 0; i < matchingCodecs.size(); ++i) { componentName = matchingCodecs[i].string(); -#if BUILD_WITH_FULL_STAGEFRIGHT sp<MediaSource> softwareCodec = createEncoder? InstantiateSoftwareEncoder(componentName, source, meta): InstantiateSoftwareCodec(componentName, source); @@ -435,7 +434,6 @@ sp<MediaSource> OMXCodec::Create( return softwareCodec; } -#endif LOGV("Attempting to allocate OMX node '%s'", componentName); diff --git a/media/libstagefright/id3/Android.mk b/media/libstagefright/id3/Android.mk index 93fac1c..23c8e44 100644 --- a/media/libstagefright/id3/Android.mk +++ b/media/libstagefright/id3/Android.mk @@ -1,5 +1,3 @@ -ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) - LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -28,5 +26,3 @@ LOCAL_MODULE_TAGS := debug LOCAL_MODULE := testid3 include $(BUILD_EXECUTABLE) - -endif diff --git a/media/libstagefright/omx/tests/Android.mk b/media/libstagefright/omx/tests/Android.mk index ee117e5..8bf4336 100644 --- a/media/libstagefright/omx/tests/Android.mk +++ b/media/libstagefright/omx/tests/Android.mk @@ -1,5 +1,3 @@ -ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) - LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -17,7 +15,3 @@ LOCAL_C_INCLUDES:= \ LOCAL_MODULE:= omx_tests include $(BUILD_EXECUTABLE) - -endif - - |