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

Commit 622972e2 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "media: stagefright: Implement TARGET_USE_SOFTWARE_AUDIO_AAC in OMXCodec" into gingerbread

parents 2fdbcb96 3333fbb8

media/libstagefright/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -115,6 +115,10 @@ ifeq ($(BOARD_CAMERA_USE_GETBUFFERINFO),true) 
        LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/media/mm-core/omxcore/inc

endif



ifeq ($(TARGET_USE_SOFTWARE_AUDIO_AAC),true)

	LOCAL_CFLAGS += -DUSE_SOFTWARE_AUDIO_AAC

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
@@ -169,7 +169,9 @@ static const CodecInfo kDecoderInfo[] = { 
    { MEDIA_MIMETYPE_AUDIO_AMR_WB, "OMX.TI.WBAMR.decode" },

    { MEDIA_MIMETYPE_AUDIO_AMR_WB, "AMRWBDecoder" },

//    { MEDIA_MIMETYPE_AUDIO_AMR_WB, "OMX.PV.amrdec" },

#ifndef USE_SOFTWARE_AUDIO_AAC

    { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.Nvidia.aac.decoder" },

#endif

    { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.TI.AAC.decode" },

    { MEDIA_MIMETYPE_AUDIO_AAC, "AACDecoder" },

//    { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.PV.aacdec" },