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

Commit 107aebf3 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 8c7ab034: Fixing the build, only instantiate the software aac decoder in... 

am 8c7ab034: Fixing the build, only instantiate the software aac decoder in full stagefright builds.

Merge commit '8c7ab034692eea550b97bebd7746e1a82735bbbd' into eclair-mr2-plus-aosp

* commit '8c7ab034692eea550b97bebd7746e1a82735bbbd':
  Fixing the build, only instantiate the software aac decoder in full stagefright builds.
parents a0708be5 92616b56

media/libstagefright/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ LOCAL_SRC_FILES += \ 
        WAVExtractor.cpp          \

        string.cpp



LOCAL_CFLAGS += -DBUILD_WITH_FULL_STAGEFRIGHT

endif



LOCAL_C_INCLUDES:= \

media/libstagefright/OMXCodec.cpp

+5 −0
Original line number Diff line number Diff line
@@ -18,7 +18,10 @@ 
#define LOG_TAG "OMXCodec"

#include <utils/Log.h>



#if BUILD_WITH_FULL_STAGEFRIGHT

#include "include/AACDecoder.h"

#endif



#include "include/ESDS.h"



#include <binder/IServiceManager.h>
@@ -285,9 +288,11 @@ sp<MediaSource> OMXCodec::Create( 
    bool success = meta->findCString(kKeyMIMEType, &mime);

    CHECK(success);



#if BUILD_WITH_FULL_STAGEFRIGHT

    if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC)) {

        return new AACDecoder(source);

    }

#endif



    Vector<String8> matchingCodecs;

    findMatchingCodecs(