Merge "hal: update audio feature flags" (f95f5f8e) · Commits · e / os / android_hardware_qcom_audio

hal/Android.mk

+19 −22

Original line number	Diff line number	Diff line
		@@ -41,97 +41,94 @@ LOCAL_SRC_FILES := \
		LOCAL_SRC_FILES += audio_extn/audio_extn.c \
		audio_extn/utils.c

		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_PCM_OFFLOAD)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PCM_OFFLOAD)),true)
		LOCAL_CFLAGS += -DPCM_OFFLOAD_ENABLED
		endif

		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_ANC_HEADSET)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_ANC_HEADSET)),true)
		LOCAL_CFLAGS += -DANC_HEADSET_ENABLED
		endif

		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_FLUENCE)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FLUENCE)),true)
		LOCAL_CFLAGS += -DFLUENCE_ENABLED
		endif

		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_PROXY_DEVICE)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PROXY_DEVICE)),true)
		LOCAL_CFLAGS += -DAFE_PROXY_ENABLED
		endif

		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_FM)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FM)),true)
		LOCAL_CFLAGS += -DFM_ENABLED
		LOCAL_SRC_FILES += audio_extn/fm.c
		endif

		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_USBAUDIO)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_USBAUDIO)),true)
		LOCAL_CFLAGS += -DUSB_HEADSET_ENABLED
		LOCAL_SRC_FILES += audio_extn/usb.c
		endif
		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_HFP)),true)

		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_HFP)),true)
		LOCAL_CFLAGS += -DHFP_ENABLED
		LOCAL_SRC_FILES += audio_extn/hfp.c
		endif

		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_CUSTOMSTEREO)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_CUSTOMSTEREO)),true)
		LOCAL_CFLAGS += -DCUSTOM_STEREO_ENABLED
		endif

		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_SSR)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_SSR)),true)
		LOCAL_CFLAGS += -DSSR_ENABLED
		LOCAL_SRC_FILES += audio_extn/ssr.c
		LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/surround_sound/
		LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/common/inc/
		endif

		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_MULTI_VOICE_SESSIONS)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS)),true)
		LOCAL_CFLAGS += -DMULTI_VOICE_SESSION_ENABLED
		LOCAL_SRC_FILES += voice_extn/voice_extn.c
		LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
		LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_INCALL_MUSIC)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_INCALL_MUSIC)),true)
		LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED
		endif

		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_COMPRESS_VOIP)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_COMPRESS_VOIP)),true)
		LOCAL_CFLAGS += -DCOMPRESS_VOIP_ENABLED
		LOCAL_SRC_FILES += voice_extn/compress_voip.c
		endif

		endif

		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_FORMATS)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_EXTN_FORMATS)),true)
		LOCAL_CFLAGS += -DFORMATS_ENABLED
		endif

		ifneq ($(strip, $(AUDIO_FEATURE_DISABLED_SPKR_PROTECTION)),true)
		ifneq ($(filter msm8974 apq8084,$(TARGET_BOARD_PLATFORM)),)
		ifeq ($(strip, $(AUDIO_FEATURE_ENABLED_SPKR_PROTECTION)),true)
		LOCAL_CFLAGS += -DSPKR_PROT_ENABLED
		LOCAL_SRC_FILES += audio_extn/spkr_protection.c
		LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
		LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
		endif
		endif

		ifdef MULTIPLE_HW_VARIANTS_ENABLED
		LOCAL_CFLAGS += -DHW_VARIANTS_ENABLED
		LOCAL_SRC_FILES += $(AUDIO_PLATFORM)/hw_info.c
		endif

		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_COMPRESS_CAPTURE)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE)),true)
		LOCAL_CFLAGS += -DCOMPRESS_CAPTURE_ENABLED
		LOCAL_SRC_FILES += audio_extn/compress_capture.c
		endif

		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_DS1_DOLBY_DDP)),true)
		ifeq ($(strip $(DOLBY_DDP)),true)
		LOCAL_CFLAGS += -DDS1_DOLBY_DDP_ENABLED
		LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
		LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
		LOCAL_SRC_FILES += audio_extn/dolby.c
		endif

		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_DS1_DOLBY_DAP)),true)
		ifeq ($(strip $(DOLBY_DAP)),true)
		LOCAL_CFLAGS += -DDS1_DOLBY_DAP_ENABLED
		ifeq ($(strip $(AUDIO_FEATURE_DISABLED_DS1_DOLBY_DDP)),true)
		ifneq ($(strip $(DOLBY_DDP)),true)
		LOCAL_SRC_FILES += audio_extn/dolby.c
		endif
		endif

hal/audio_extn/audio_extn.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ void audio_extn_fm_set_parameters(struct audio_device *adev,
		struct str_parms *parms);
		#endif
		#ifndef HFP_ENABLED
		void audio_extn_hfp_set_parameters(adev, parms) (0)
		#define audio_extn_hfp_set_parameters(adev, parms) (0)
		#else
		void audio_extn_hfp_set_parameters(struct audio_device *adev,
		struct str_parms *parms);

hal/audio_extn/audio_extn.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -27,9 +27,7 @@
		#define AUDIO_FORMAT_PCM_16_BIT_OFFLOAD (AUDIO_FORMAT_PCM_OFFLOAD \| AUDIO_FORMAT_PCM_SUB_16_BIT)
		#define AUDIO_FORMAT_PCM_24_BIT_OFFLOAD (AUDIO_FORMAT_PCM_OFFLOAD \| AUDIO_FORMAT_PCM_SUB_8_24_BIT)
		#define AUDIO_OFFLOAD_CODEC_FORMAT "music_offload_codec_format"
		static inline bool audio_is_offload_pcm(audio_format_t format) {
		return ((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_PCM_OFFLOAD);
		}
		#define audio_is_offload_pcm(format) (0)
		#endif

		#ifndef AFE_PROXY_ENABLED
		@@ -57,7 +55,7 @@ static inline bool audio_is_offload_pcm(audio_format_t format) {
		#define AUDIO_SOURCE_FM_RX 9
		#define AUDIO_SOURCE_FM_RX_A2DP 10
		#define AUDIO_DEVICE_IN_FM_RX (AUDIO_DEVICE_BIT_IN \| 0x8000)
		#define AUDIO_DEVICE_IN_FM_RX_A2DP AUDIO_DEVICE_BIT_IN \| 0x10000
		#define AUDIO_DEVICE_IN_FM_RX_A2DP (AUDIO_DEVICE_BIT_IN \| 0x10000)
		#endif

mm-audio/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)
		include $(call all-subdir-makefiles)
		endif

policy_hal/Android.mk

+5 −5

Original line number	Diff line number	Diff line
		ifneq ($(strip $(BOARD_USES_AOSP_AUDIO_POLICY_MANAGER)),true)
		ifeq ($(strip $(BOARD_USES_EXTN_AUDIO_POLICY_MANAGER)),true)

		LOCAL_PATH := $(call my-dir)
		include $(CLEAR_VARS)
		@@ -20,16 +20,16 @@ LOCAL_MODULE := audio_policy.$(TARGET_BOARD_PLATFORM)
		LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
		LOCAL_MODULE_TAGS := optional

		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_FM)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FM)),true)
		LOCAL_CFLAGS += -DAUDIO_EXTN_FM_ENABLED
		endif
		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_PROXY_DEVICE)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PROXY_DEVICE)),true)
		LOCAL_CFLAGS += -DAUDIO_EXTN_AFE_PROXY_ENABLED
		endif
		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_INCALL_MUSIC)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_INCALL_MUSIC)),true)
		LOCAL_CFLAGS += -DAUDIO_EXTN_INCALL_MUSIC_ENABLED
		endif
		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_HDMI_SPK)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_HDMI_SPK)),true)
		LOCAL_CFLAGS += -DAUDIO_EXTN_HDMI_SPK_ENABLED
		endif