Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing the build, only instantiate the software aac decoder in full stagefright builds.

Browse Source
This commit is contained in:
Andreas Huber
2009-12-07 11:23:44 -08:00
parent 73abc2ea4c
commit 8c7ab03469
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/libstagefright/Android.mk
View File

@@ -36,6 +36,7 @@ LOCAL_SRC_FILES += \
WAVExtractor.cpp \ WAVExtractor.cpp \
string.cpp string.cpp
LOCAL_CFLAGS += -DBUILD_WITH_FULL_STAGEFRIGHT
endif endif
LOCAL_C_INCLUDES:= \ LOCAL_C_INCLUDES:= \

5
media/libstagefright/OMXCodec.cpp
View File

@@ -18,7 +18,10 @@
#define LOG_TAG "OMXCodec" #define LOG_TAG "OMXCodec"
#include <utils/Log.h> #include <utils/Log.h>
#if BUILD_WITH_FULL_STAGEFRIGHT
#include "include/AACDecoder.h" #include "include/AACDecoder.h"
#endif
#include "include/ESDS.h" #include "include/ESDS.h"
#include <binder/IServiceManager.h> #include <binder/IServiceManager.h>
@@ -285,9 +288,11 @@ sp<MediaSource> OMXCodec::Create(
bool success = meta->findCString(kKeyMIMEType, &mime); bool success = meta->findCString(kKeyMIMEType, &mime);
CHECK(success); CHECK(success);
#if BUILD_WITH_FULL_STAGEFRIGHT
if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC)) { if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC)) {
return new AACDecoder(source); return new AACDecoder(source);
} }
#endif
Vector<String8> matchingCodecs; Vector<String8> matchingCodecs;
findMatchingCodecs( findMatchingCodecs(