diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-06 05:23:41 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2013-02-06 05:23:41 -0800 |
| commit | 0320f8a25d3670b55c50028830fea20e351b60ff (patch) | |
| tree | 94f0f7eff1aa53da4cde85fc6ec59c11a20b0939 | |
| parent | 0db8a19fb3216a8a83d5d6cbd5f1ccbf997a20d8 (diff) | |
| parent | a5f28cef4ec9a50108428b55e87d4045aa5a1458 (diff) | |
| download | frameworks_av-0320f8a25d3670b55c50028830fea20e351b60ff.zip frameworks_av-0320f8a25d3670b55c50028830fea20e351b60ff.tar.gz frameworks_av-0320f8a25d3670b55c50028830fea20e351b60ff.tar.bz2 | |
Merge "Fix mako build." into cm-10.1
| -rwxr-xr-x | media/libstagefright/Android.mk | 13 | ||||
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index ea64cc8..e2209ff4 100755 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -1,13 +1,6 @@ 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 diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index 348f485..ee885a5 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -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 |