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

Commit 472a4946 authored by Prashant Somashekar's avatar Prashant Somashekar
Browse files

media: stagefright: Implement TARGET_DONT_SET_AUDIO_AAC_FORMAT in OMXCodec 

On Harmony, when the AAC format is explictly set, HW AAC cannot function.

When TARGET_DONT_SET_AUDIO_AAC_FORMAT : true is set in the BoardConfig.mk,
then this will be operable.

This change can most likely be reverted in a few days,
after all dependant devices have tested:
3333fbb8
(media: stagefright: Implement TARGET_USE_SOFTWARE_AUDIO_AAC in OMXCodec)

thx arcee:)

Change-Id: Icaafaa7cbca0214d5e410a56561cd9d866473f32
parent 414d4864

media/libstagefright/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -119,6 +119,10 @@ ifeq ($(TARGET_USE_SOFTWARE_AUDIO_AAC),true) 
	LOCAL_CFLAGS += -DUSE_SOFTWARE_AUDIO_AAC

endif



ifeq ($(TARGET_DONT_SET_AUDIO_AAC_FORMAT),true)

        LOCAL_CFLAGS += -DDONT_SET_AUDIO_AAC_FORMAT

endif



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

        LOCAL_LDLIBS += -lpthread

endif

media/libstagefright/OMXCodec.cpp

+2 −0
Original line number Diff line number Diff line
@@ -689,7 +689,9 @@ status_t OMXCodec::configureCodec(const sp<MetaData> &meta, uint32_t flags) { 
        CHECK(meta->findInt32(kKeyChannelCount, &numChannels));

        CHECK(meta->findInt32(kKeySampleRate, &sampleRate));



#ifndef DONT_SET_AUDIO_AAC_FORMAT

        setAACFormat(numChannels, sampleRate, bitRate);

#endif

    }



    if (!strncasecmp(mMIME, "video/", 6)) {