diff options
| author | LorDClockaN <davor@losinj.com> | 2014-09-13 21:10:46 +0200 |
|---|---|---|
| committer | eyosen <abittin@gmail.com> | 2014-09-14 14:33:48 +0300 |
| commit | 6d35f2956639f78f0171a355178b84a3fb5f5c6b (patch) | |
| tree | 9b168f55db0e0804f33e8d8d8be4a1928d5fc783 | |
| parent | 04ceddf228c169ba08d56bd68e5e4ef187775a31 (diff) | |
Fix build for non-AV-ENHANCED or non-QCOM boards
PS6: bring it inline with
https://github.com/CyanogenMod/android_frameworks_av/commit/09dd0f0228d76be5476afbf5ffe3bfe6fd2aecdf
Change-Id: If0f85f5d86db60dbd6c7bf7fda704d92805b3c49
| -rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index cb90e74..99ab2e8 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -1491,6 +1491,8 @@ bool AudioPolicyManagerBase::isOffloadSupported(const audio_offload_info_t& offl char propValue[PROPERTY_VALUE_MAX]; bool pcmOffload = false; + +#if defined(ENABLE_AV_ENHANCEMENTS) || defined(ENABLE_OFFLOAD_ENHANCEMENTS) if (audio_is_offload_pcm(offloadInfo.format)) { if(property_get("audio.offload.pcm.enable", propValue, "false")) { bool prop_enabled = atoi(propValue) || !strncmp("true", propValue, 4); @@ -1504,6 +1506,7 @@ bool AudioPolicyManagerBase::isOffloadSupported(const audio_offload_info_t& offl return false; } } +#endif // Check if offload has been disabled if (property_get("audio.offload.disable", propValue, "0")) { @@ -3821,8 +3824,10 @@ const struct StringToEnum sFormatNameToEnumTable[] = { STRING_TO_ENUM(AUDIO_FORMAT_EVRCNW), STRING_TO_ENUM(AUDIO_FORMAT_FLAC), #endif +#if defined(ENABLE_AV_ENHANCEMENTS) || defined(ENABLE_OFFLOAD_ENHANCEMENTS) STRING_TO_ENUM(AUDIO_FORMAT_PCM_16_BIT_OFFLOAD), STRING_TO_ENUM(AUDIO_FORMAT_PCM_24_BIT_OFFLOAD), +#endif }; const struct StringToEnum sOutChannelsNameToEnumTable[] = { |