diff options
| author | Ethan Chen <intervigil@gmail.com> | 2014-07-25 14:57:15 -0700 |
|---|---|---|
| committer | myfluxi <linflux@arcor.de> | 2014-10-09 18:37:00 +0200 |
| commit | 68d0fd75a73c04bee94560b13bca5b325b3ef87d (patch) | |
| tree | 3bdbc123bdc5ccaefd4f0b8851046a9dde05fda7 | |
| parent | fef19c50efccde9a16a7cd806c96560e473113f2 (diff) | |
| download | hardware_qcom_audio-stable/cm-11.0-XNG2S.tar.gz hardware_qcom_audio-stable/cm-11.0-XNG2S.tar.bz2 hardware_qcom_audio-stable/cm-11.0-XNG2S.zip | |
hal: Limit MP2 and WMA offload to 8226/8974 devies onlystable/cm-11.0-XNG3Cstable/cm-11.0-XNG2S
* 8960 devices are not capable of these features.
Change-Id: I37ee867c4e8377d70344abec5d72a5de86c45ca5
| -rw-r--r-- | hal/Android.mk | 16 | ||||
| -rw-r--r-- | hal/audio_hw.c | 4 |
2 files changed, 20 insertions, 0 deletions
diff --git a/hal/Android.mk b/hal/Android.mk index b7acf4c0..9d1fec90 100644 --- a/hal/Android.mk +++ b/hal/Android.mk @@ -43,6 +43,22 @@ ifneq ($(strip $(PRODUCT_BRAND)),google) LOCAL_CFLAGS += -DDISABLE_TMUS_AUDIO endif +ifneq ($(filter msm8974 msm8226,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(strip $(AUDIO_FEATURE_DISABLED_WMA_OFFLOAD_DISABLED)),true) + LOCAL_CFLAGS += -DWMA_OFFLOAD_ENABLED + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include + LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr +endif +endif + +ifneq ($(filter msm8974 msm8226,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(strip $(AUDIO_FEATURE_DISABLED_MP2_OFFLOAD)),true) + LOCAL_CFLAGS += -DMP2_OFFLOAD_ENABLED + LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include + LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr +endif +endif + ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD)),true) LOCAL_CFLAGS += -DFLAC_OFFLOAD_ENABLED endif diff --git a/hal/audio_hw.c b/hal/audio_hw.c index eb49dfe9..ef5e6ad4 100644 --- a/hal/audio_hw.c +++ b/hal/audio_hw.c @@ -193,15 +193,19 @@ static int get_snd_codec_id(audio_format_t format) case AUDIO_FORMAT_AAC: id = SND_AUDIOCODEC_AAC; break; +#ifdef WMA_OFFLOAD_ENABLED case AUDIO_FORMAT_WMA: id = SND_AUDIOCODEC_WMA; break; case AUDIO_FORMAT_WMA_PRO: id = SND_AUDIOCODEC_WMA_PRO; break; +#endif +#ifdef MP2_OFFLOAD_ENABLED case AUDIO_FORMAT_MP2: id = SND_AUDIOCODEC_MP2; break; +#endif case AUDIO_FORMAT_PCM_16_BIT_OFFLOAD: case AUDIO_FORMAT_PCM_24_BIT_OFFLOAD: id = SND_AUDIOCODEC_PCM; |