diff options
| -rw-r--r-- | media/libstagefright/Android.mk | 14 | ||||
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 33 | ||||
| -rw-r--r-- | media/libstagefright/codecs/Android.mk | 4 | ||||
| -rw-r--r-- | media/libstagefright/id3/Android.mk | 3 |
4 files changed, 20 insertions, 34 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index dbb52c6..b25ce67 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -60,8 +60,6 @@ LOCAL_SHARED_LIBRARIES := \ libsonivox \ libvorbisidec -ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) - LOCAL_STATIC_LIBRARIES := \ libstagefright_aacdec \ libstagefright_amrnbdec \ @@ -69,12 +67,18 @@ LOCAL_STATIC_LIBRARIES := \ libstagefright_amrwbdec \ libstagefright_avcdec \ libstagefright_m4vh263dec \ - libstagefright_mp3dec \ - libstagefright_id3 + libstagefright_mp3dec LOCAL_SHARED_LIBRARIES += \ libstagefright_amrnb_common \ - libstagefright_avc_common \ + libstagefright_avc_common + +ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) + +LOCAL_STATIC_LIBRARIES += \ + libstagefright_id3 + +LOCAL_SHARED_LIBRARIES += \ libstagefright_color_conversion endif diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 90bbdfe..0355a82 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -18,7 +18,6 @@ #define LOG_TAG "OMXCodec" #include <utils/Log.h> -#if BUILD_WITH_FULL_STAGEFRIGHT #include "include/AACDecoder.h" #include "include/AMRNBDecoder.h" #include "include/AMRNBEncoder.h" @@ -26,7 +25,6 @@ #include "include/AVCDecoder.h" #include "include/M4vH263Decoder.h" #include "include/MP3Decoder.h" -#endif #include "include/ESDS.h" @@ -56,9 +54,6 @@ struct CodecInfo { const char *codec; }; -#if BUILD_WITH_FULL_STAGEFRIGHT -#define OPTIONAL(x,y) { x, y }, - #define FACTORY_CREATE(name) \ static sp<MediaSource> Make##name(const sp<MediaSource> &source) { \ return new name(source); \ @@ -103,42 +98,30 @@ static sp<MediaSource> InstantiateSoftwareCodec( #undef FACTORY_REF #undef FACTORY_CREATE -#else -#define OPTIONAL(x,y) -#endif - static const CodecInfo kDecoderInfo[] = { { MEDIA_MIMETYPE_IMAGE_JPEG, "OMX.TI.JPEG.decode" }, { MEDIA_MIMETYPE_AUDIO_MPEG, "OMX.TI.MP3.decode" }, - OPTIONAL(MEDIA_MIMETYPE_AUDIO_MPEG, "MP3Decoder") - { MEDIA_MIMETYPE_AUDIO_MPEG, "OMX.PV.mp3dec" }, + { MEDIA_MIMETYPE_AUDIO_MPEG, "MP3Decoder" }, { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.TI.AMR.decode" }, - OPTIONAL(MEDIA_MIMETYPE_AUDIO_AMR_NB, "AMRNBDecoder") - { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.PV.amrdec" }, + { MEDIA_MIMETYPE_AUDIO_AMR_NB, "AMRNBDecoder" }, { MEDIA_MIMETYPE_AUDIO_AMR_WB, "OMX.TI.WBAMR.decode" }, - OPTIONAL(MEDIA_MIMETYPE_AUDIO_AMR_WB, "AMRWBDecoder") - { MEDIA_MIMETYPE_AUDIO_AMR_WB, "OMX.PV.amrdec" }, + { MEDIA_MIMETYPE_AUDIO_AMR_WB, "AMRWBDecoder" }, { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.TI.AAC.decode" }, - OPTIONAL(MEDIA_MIMETYPE_AUDIO_AAC, "AACDecoder") - { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.PV.aacdec" }, + { MEDIA_MIMETYPE_AUDIO_AAC, "AACDecoder" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.video.decoder.mpeg4" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.TI.Video.Decoder" }, - OPTIONAL(MEDIA_MIMETYPE_VIDEO_MPEG4, "M4vH263Decoder") - { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.PV.mpeg4dec" }, + { MEDIA_MIMETYPE_VIDEO_MPEG4, "M4vH263Decoder" }, { MEDIA_MIMETYPE_VIDEO_H263, "OMX.qcom.video.decoder.h263" }, { MEDIA_MIMETYPE_VIDEO_H263, "OMX.TI.Video.Decoder" }, - OPTIONAL(MEDIA_MIMETYPE_VIDEO_H263, "M4vH263Decoder") - { MEDIA_MIMETYPE_VIDEO_H263, "OMX.PV.h263dec" }, + { MEDIA_MIMETYPE_VIDEO_H263, "M4vH263Decoder" }, { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.qcom.video.decoder.avc" }, { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.TI.Video.Decoder" }, - OPTIONAL(MEDIA_MIMETYPE_VIDEO_AVC, "AVCDecoder") - { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.PV.avcdec" }, + { MEDIA_MIMETYPE_VIDEO_AVC, "AVCDecoder" }, }; static const CodecInfo kEncoderInfo[] = { { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.TI.AMR.encode" }, - OPTIONAL(MEDIA_MIMETYPE_AUDIO_AMR_NB, "AMRNBEncoder") - { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.PV.amrencnb" }, + { MEDIA_MIMETYPE_AUDIO_AMR_NB, "AMRNBEncoder" }, { MEDIA_MIMETYPE_AUDIO_AMR_WB, "OMX.TI.WBAMR.encode" }, { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.TI.AAC.encode" }, { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.PV.aacenc" }, diff --git a/media/libstagefright/codecs/Android.mk b/media/libstagefright/codecs/Android.mk index 1fa7e93..2e43120 100644 --- a/media/libstagefright/codecs/Android.mk +++ b/media/libstagefright/codecs/Android.mk @@ -1,8 +1,4 @@ -ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) - LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) include $(call all-makefiles-under,$(LOCAL_PATH)) - -endif diff --git a/media/libstagefright/id3/Android.mk b/media/libstagefright/id3/Android.mk index 3c47e2e..add8f3c 100644 --- a/media/libstagefright/id3/Android.mk +++ b/media/libstagefright/id3/Android.mk @@ -1,3 +1,5 @@ +ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) + LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -25,3 +27,4 @@ LOCAL_MODULE := testid3 include $(BUILD_EXECUTABLE) +endif |