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

Commit 0320f8a2 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Fix mako build." into cm-10.1

parents 0db8a19f a5f28cef

media/libstagefright/Android.mk

+6 −7
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



ifeq ($(BOARD_USES_ALSA_AUDIO),true)

    ifeq ($(call is-chipset-in-board-platform,msm8960),true)

        LOCAL_CFLAGS += -DUSE_TUNNEL_MODE

        LOCAL_CFLAGS += -DTUNNEL_MODE_SUPPORTS_AMRWB

    endif

endif



include frameworks/av/media/libstagefright/codecs/common/Config.mk



LOCAL_SRC_FILES:=                         \
@@ -101,6 +94,12 @@ ifeq ($(TARGET_QCOM_AUDIO_VARIANT),caf) 
    else

        LOCAL_SRC_FILES += LPAPlayerALSA.cpp

    endif

    ifeq ($(BOARD_USES_ALSA_AUDIO),true)

        ifeq ($(call is-chipset-in-board-platform,msm8960),true)

            LOCAL_CFLAGS += -DUSE_TUNNEL_MODE

            LOCAL_CFLAGS += -DTUNNEL_MODE_SUPPORTS_AMRWB

        endif

    endif

LOCAL_CFLAGS += -DQCOM_ENHANCED_AUDIO

LOCAL_SRC_FILES += TunnelPlayer.cpp

endif

media/libstagefright/include/AwesomePlayer.h

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ private: 


    size_t countTracks() const;



#ifdef QCOM_ENHANCED_AUDIO

#ifdef USE_TUNNEL_MODE

    bool inSupportedTunnelFormats(const char * mime);



    //Flag to check if tunnel mode audio is enabled