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

Commit 7854128f authored May 16, 2014 by Mingming Yin Committed by Divya Narayanan Poojary Jul 14, 2014

hal: update audio feature flags

- update audio feature flags to use
  AUDIO_FEATURE_ENABLED_XXX instead of
  AUDIO_FEATURE_DISABLED_XXX.
- These feature flags are defined
  by target board config file

Conflicts:
	hal/Android.mk
	hal/audio_extn/audio_extn.h
	policy_hal/Android.mk
	post_proc/Android.mk

Conflicts:
	mm-audio/Android.mk
	policy_hal/Android.mk
	post_proc/Android.mk

Change-Id: Iba482d8b72bfa2675877d833d7abcb93d4cf4907

parent ee733608

hal/Android.mk

+29 −19

Original line number	Diff line number	Diff line
		@@ -30,83 +30,93 @@ LOCAL_SRC_FILES := \

		LOCAL_SRC_FILES += audio_extn/audio_extn.c

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

		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_SSR)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_CUSTOMSTEREO)),true)
		LOCAL_CFLAGS += -DCUSTOM_STEREO_ENABLED
		endif

		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/
		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_SPKR_PROTECTION)),true)
		ifneq ($(filter msm8974,$(TARGET_BOARD_PLATFORM)),)

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

		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.h

+39 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,45 @@

		#include <cutils/str_parms.h>

		#ifndef PCM_OFFLOAD_ENABLED
		#define AUDIO_FORMAT_PCM_OFFLOAD 0x17000000UL
		#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"
		#define audio_is_offload_pcm(format) (0)
		#endif

		#ifndef AFE_PROXY_ENABLED
		#define AUDIO_DEVICE_OUT_PROXY 0x40000
		#endif

		#ifndef COMPRESS_VOIP_ENABLED
		#define AUDIO_OUTPUT_FLAG_VOIP_RX 0x4000
		#endif

		#ifndef INCALL_MUSIC_ENABLED
		#define AUDIO_OUTPUT_FLAG_INCALL_MUSIC 0x8000
		#endif

		#ifndef FLUENCE_ENABLED
		#define AUDIO_PARAMETER_KEY_FLUENCE "fluence"
		#define AUDIO_PARAMETER_VALUE_QUADMIC "quadmic"
		#define AUDIO_PARAMETER_VALUE_DUALMIC "dualmic"
		#define AUDIO_PARAMETER_KEY_NO_FLUENCE "none"
		#endif

		#ifndef FM_ENABLED
		#define AUDIO_DEVICE_OUT_FM 0x80000
		#define AUDIO_DEVICE_OUT_FM_TX 0x100000
		#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)
		#endif


		#define MAX_LENGTH_MIXER_CONTROL_IN_INT (128)

		void audio_extn_set_parameters(struct audio_device *adev,
		struct str_parms *parms);

mm-audio/Android.mk

+1 −1

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

policy_hal/Android.mk

+17 −6

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

		LOCAL_PATH := $(call my-dir)
		include $(CLEAR_VARS)
		@@ -21,17 +20,29 @@ 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
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_HDMI_SPK)),true)
		LOCAL_CFLAGS += -DAUDIO_EXTN_HDMI_SPK_ENABLED
		endif


		ifeq ($(strip $(TARGET_BOARD_PLATFORM)),msm8916)
		LOCAL_CFLAGS += -DVOICE_CONCURRENCY
		LOCAL_CFLAGS += -DWFD_CONCURRENCY
		endif

		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_MULTIPLE_TUNNEL)), true)
		LOCAL_CFLAGS += -DMULTIPLE_OFFLOAD_ENABLED
		endif

		include $(BUILD_SHARED_LIBRARY)

		endif
		endif#endif for AUDIO_FEATURE_DISABLED_EXTN_APM

post_proc/Android.mk

+5 −1

Original line number	Diff line number	Diff line
		ifneq ($(strip $(AUDIO_FEATURE_DISABLED_EXTN_POST_PROC)),true)
		ifeq ($(strip $(AUDIO_FEATURE_ENABLED_EXTN_POST_PROC)),true)
		LOCAL_PATH:= $(call my-dir)

		include $(CLEAR_VARS)

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

		LOCAL_SRC_FILES:= \
		bundle.c \
		equalizer.c \