Merge "hal: Add Makefile and configure file for hal" into audio-userspace.lnx.2.1-dev (76e97112) · Commits · e / devices / Fairphone 4 / android_hardware_qcom_audio

Makefile.am

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		SUBDIRS = hal
		ACLOCAL_AMFLAGS = -I m4

configure.ac

0 → 100644

+83 −0

Original line number	Diff line number	Diff line
		# -- Autoconf --
		# configure.ac -- Autoconf script for halinterface
		#

		# Process this file with autoconf to produce a configure script.

		# Requires autoconf tool later than 2.61
		AC_PREREQ([2.69])
		# Initialize the hal-interface package version 1.0.0
		AC_INIT(halinterface,1.0.0)
		# Does not strictly follow GNU Coding standards
		AM_INIT_AUTOMAKE([foreign])
		# Disables auto rebuilding of configure, Makefile.ins
		#AM_MAINTAINER_MODE
		# defines some macros variable to be included by source
		AC_CONFIG_HEADERS([config.h])
		# defines some macros variable to be included by source
		AC_CONFIG_MACRO_DIR([m4])

		# Checks for programs.
		AC_PROG_CC
		AM_PROG_CC_C_O
		AC_PROG_CXX
		AC_PROG_LIBTOOL
		AC_PROG_AWK
		AC_PROG_CPP
		AC_PROG_INSTALL
		AC_PROG_LN_S
		AC_PROG_MAKE_SET
		PKG_PROG_PKG_CONFIG

		PKG_CHECK_MODULES([AUDIOROUTE], [audio_route])
		AC_SUBST([AUDIOROUTE_CFLAGS])

		AC_ARG_WITH(sanitized-headers,
		AS_HELP_STRING([--with-sanitized-headers=DIR],
		[Specify the location of the sanitized Linux headers]),
		[CPPFLAGS="$CPPFLAGS -idirafter $withval"])


		AC_ARG_WITH([glib],
		AC_HELP_STRING([--with-glib],
		[enable glib, Build against glib. Use this when building for HLOS systems which use glib]))

		if (test "x${with_glib}" = "xyes"); then
		PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.16, dummy=yes,
		AC_MSG_ERROR(GThread >= 2.16 is required))
		PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, dummy=yes,
		AC_MSG_ERROR(GLib >= 2.16 is required))
		GLIB_CFLAGS="$GLIB_CFLAGS $GTHREAD_CFLAGS"
		GLIB_LIBS="$GLIB_LIBS $GTHREAD_LIBS"

		AC_SUBST(GLIB_CFLAGS)
		AC_SUBST(GLIB_LIBS)
		fi

		AM_CONDITIONAL(USE_GLIB, test "x${with_glib}" = "xyes")

		AM_CONDITIONAL([HDMI_EDID], [test x$AUDIO_FEATURE_ENABLED_HDMI_EDID = xtrue])
		AM_CONDITIONAL([FM_POWER_OPT], [test x$AUDIO_FEATURE_ENABLED_FM_POWER_OPT = xtrue])
		AM_CONDITIONAL([USBAUDIO], [test x$AUDIO_FEATURE_ENABLED_USBAUDIO = xtrue])
		AM_CONDITIONAL([HFP], [test x$AUDIO_FEATURE_ENABLED_HFP = xtrue])
		AM_CONDITIONAL([SSR], [test x$AUDIO_FEATURE_ENABLED_SSR = xtrue])
		AM_CONDITIONAL([MULTI_VOICE_SESSIONS], [test x$AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS = xtrue])
		AM_CONDITIONAL([COMPRESS_VOIP], [test x$AUDIO_FEATURE_ENABLED_COMPRESS_VOIP = xtrue])
		AM_CONDITIONAL([SPKR_PROTECTION], [test x$AUDIO_FEATURE_ENABLED_SPKR_PROTECTION = xtrue])
		AM_CONDITIONAL([HW_VARIANTS], [test x$MULTIPLE_HW_VARIANTS_ENABLED = xtrue])
		AM_CONDITIONAL([COMPRESS_CAPTURE], [test x$AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE = xtrue])
		AM_CONDITIONAL([DTS_EAGLE], [test x$AUDIO_FEATURE_ENABLED_DTS_EAGLE = xtrue])
		AM_CONDITIONAL([DOLBY_DDP], [test x$DOLBY_DDP = xtrue])
		AM_CONDITIONAL([DS1_DOLBY_DAP], [test x$DS1_DOLBY_DAP = xtrue])
		AM_CONDITIONAL([DEV_ARBI], [test x$AUDIO_FEATURE_ENABLED_DEV_ARBI = xtrue])
		AM_CONDITIONAL([SOURCE_TRACKING], [test x$AUDIO_FEATURE_ENABLED_SOURCE_TRACKING = xtrue])
		AM_CONDITIONAL([LISTEN], [test x$AUDIO_FEATURE_ENABLED_LISTEN = xtrue])
		AM_CONDITIONAL([SOUND_TRIGGER], [test x$BOARD_SUPPORTS_SOUND_TRIGGER = xtrue])
		AM_CONDITIONAL([PM_SUPPORT], [test x$AUDIO_FEATURE_ENABLED_PM_SUPPORT = xtrue])

		AC_CONFIG_FILES([ \
		Makefile \
		hal/Makefile \
		])

		AC_OUTPUT

hal/Makefile.am

0 → 100644

+123 −0

Original line number	Diff line number	Diff line
		AM_CFLAGS = -I ${WORKSPACE}/external/tinyalsa/include \
		-I ${WORKSPACE}/system/media/audio_effects/include \
		-I ${WORKSPACE}/system/media/audio_utils/include \
		-I $(top_srcdir)/hal \
		-I $(top_srcdir)/hal/audio_extn \
		-I $(top_srcdir)/hal/voice_extn \
		-I $(top_srcdir)/hal/msm8916

		c_sources = audio_hw.c \
		voice.c \
		platform_info.c \
		msm8916/platform.c \
		audio_extn/audio_extn.c \
		audio_extn/utils.c

		if HDMI_EDID
		AM_CFLAGS += -DHDMI_EDID
		c_sources += edid.c
		endif

		if FM_POWER_OPT
		AM_CFLAGS += -DFM_POWER_OPT
		c_sources += audio_extn/fm.c
		endif

		if USBAUDIO
		AM_CFLAGS += -DUSB_HEADSET_ENABLED
		c_sources += audio_extn/usb.c
		endif

		if HFP
		AM_CFLAGS += -DHFP_ENABLED
		c_sources += audio_extn/hfp.c
		endif

		if SSR
		AM_CFLAGS += -DSSR_ENABLED
		c_sources += audio_extn/ssr.c
		AM_CFLAGS += -I ${WORKSPACE}/audio/mm-audio-noship/surround_sound_3mic/libsurround_3mic_proc/surround_rec_interface/inc/
		endif

		if MULTI_VOICE_SESSIONS
		AM_CFLAGS += -DMULTI_VOICE_SESSION_ENABLED
		c_sources += voice_extn/voice_extn.c
		endif

		if COMPRESS_VOIP
		AM_CFLAGS += -DCOMPRESS_VOIP_ENABLED
		c_sources += voice_extn/compress_voip.c
		endif

		if SPKR_PROTECTION
		AM_CFLAGS += -DSPKR_PROT_ENABLED
		c_sources += audio_extn/spkr_protection.c
		endif

		if HW_VARIANTS
		AM_CFLAGS += -DHW_VARIANTS_ENABLED
		c_sources += msm8916/hw_info.c
		endif

		if COMPRESS_CAPTURE
		AM_CFLAGS += -DCOMPRESS_CAPTURE_ENABLED
		c_sources += audio_extn/compress_capture.c
		endif

		if DTS_EAGLE
		AM_CFLAGS += -DDTS_EAGLE
		c_sources += audio_extn/dts_eagle.c
		endif

		if DOLBY_DDP
		AM_CFLAGS += -DDS1_DOLBY_DDP_ENABLED
		c_sources += audio_extn/dolby.c
		endif

		if DS1_DOLBY_DAP
		AM_CFLAGS += -DDS1_DOLBY_DAP_ENABLED
		if DOLBY_DDP
		c_sources += audio_extn/dolby.c
		endif
		endif

		if DEV_ARBI
		AM_CFLAGS += -DDEV_ARBI_ENABLED
		c_sources += audio_extn/dev_arbi.c
		endif

		if SOURCE_TRACKING
		AM_CFLAGS += -DSOURCE_TRACKING_ENABLED
		c_sources += audio_extn/source_track.c
		endif

		if LISTEN
		AM_CFLAGS += -DAUDIO_LISTEN_ENABLED
		AM_CFLAGS += -I ${WORKSPACE}/audio/mm-audio-noship/audio-listen
		c_sources += audio_extn/listen.c
		endif

		if SOUND_TRIGGER
		AM_CFLAGS += -DSOUND_TRIGGER_ENABLED
		AM_CFLAGS += -I ${WORKSPACE}/audio/mm-audio/sound_trigger/
		c_sources += audio_extn/soundtrigger.c
		endif

		h_sources = audio_extn/audio_defs.h \
		audio_extn/audio_extn.h \
		audio_hw.h \
		voice.h

		library_include_HEADERS = $(h_sources)
		library_includedir = $(includedir)

		lib_LTLIBRARIES = audio_primary_default.la
		audio_primary_default_la_SOURCES = $(c_sources)
		audio_primary_default_la_LIBADD = $(GLIB_LIBS) -llog -lcutils -ltinyalsa
		audio_primary_default_la_LIBADD += -ltinycompress -laudioroute -ldl -lexpat -laudioutils
		audio_primary_default_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
		audio_primary_default_la_CFLAGS += -Dstrlcat=g_strlcat
		audio_primary_default_la_CFLAGS += -DINT_MAX=0x7fffffff
		audio_primary_default_la_CFLAGS += -D__unused=__attribute__$\(__unused__$\)
		audio_primary_default_la_CFLAGS += -DLINUX_ENABLED
		audio_primary_default_la_LDFLAGS = -module -shared -avoid-version

hal/audio_extn/soundtrigger.c

+17 −4

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@

		#define XSTR(x) STR(x)
		#define STR(x) #x
		#define MAX_LIBRARY_PATH 100

		struct sound_trigger_info {
		struct sound_trigger_session_info st_ses;
		@@ -60,6 +61,21 @@ struct sound_trigger_audio_device {

		static struct sound_trigger_audio_device *st_dev;

		#if LINUX_ENABLED
		static void get_library_path(char *lib_path)
		{
		snprintf(lib_path, MAX_LIBRARY_PATH,
		"/usr/lib/sound_trigger.primary.default.so");
		}
		#else
		static void get_library_path(char *lib_path)
		{
		snprintf(lib_path, MAX_LIBRARY_PATH,
		"/system/vendor/lib/hw/sound_trigger.primary.%s.so",
		XSTR(SOUND_TRIGGER_PLATFORM_NAME));
		}
		#endif

		static struct sound_trigger_info *
		get_sound_trigger_info(int capture_handle)
		{
		@@ -349,10 +365,7 @@ int audio_extn_sound_trigger_init(struct audio_device *adev)
		return -ENOMEM;
		}

		snprintf(sound_trigger_lib, sizeof(sound_trigger_lib),
		"/system/vendor/lib/hw/sound_trigger.primary.%s.so",
		XSTR(SOUND_TRIGGER_PLATFORM_NAME));

		get_library_path(sound_trigger_lib);
		st_dev->lib_handle = dlopen(sound_trigger_lib, RTLD_NOW);

		if (st_dev->lib_handle == NULL) {

hal/audio_extn/utils.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -41,7 +41,11 @@
		#endif
		#endif

		#ifdef LINUX_ENABLED
		#define AUDIO_OUTPUT_POLICY_VENDOR_CONFIG_FILE "/etc/audio_output_policy.conf"
		#else
		#define AUDIO_OUTPUT_POLICY_VENDOR_CONFIG_FILE "/vendor/etc/audio_output_policy.conf"
		#endif

		#define OUTPUTS_TAG "outputs"