Merge tag 'android-6.0.0_r26' into cm-13.0 (fbbf508b) · Commits · e / devices / Fairphone 4 / android_hardware_qcom_audio

hal/Android.mk

+7 −0

Original line number	Diff line number	Diff line
		@@ -12,15 +12,21 @@ ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)
		AUDIO_PLATFORM = msm8974
		ifneq ($(filter msm8226,$(TARGET_BOARD_PLATFORM)),)
		LOCAL_CFLAGS := -DPLATFORM_MSM8x26
		LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="2"
		endif
		ifneq ($(filter msm8084,$(TARGET_BOARD_PLATFORM)),)
		LOCAL_CFLAGS := -DPLATFORM_MSM8084
		LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="2"
		endif
		ifneq ($(filter msm8992,$(TARGET_BOARD_PLATFORM)),)
		LOCAL_CFLAGS := -DPLATFORM_MSM8994
		LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"
		LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED
		endif
		ifneq ($(filter msm8994,$(TARGET_BOARD_PLATFORM)),)
		LOCAL_CFLAGS := -DPLATFORM_MSM8994
		LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"
		LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED
		endif
		endif

		@@ -29,6 +35,7 @@ LOCAL_SRC_FILES := \
		voice.c \
		platform_info.c \
		audio_extn/ext_speaker.c \
		audio_extn/audio_extn.c \
		$(AUDIO_PLATFORM)/platform.c

		LOCAL_SHARED_LIBRARIES := \

hal/audio_extn/audio_extn.c

0 → 100644

+102 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#define LOG_TAG "audio_hw_extn"
		/#define LOG_NDEBUG 0/
		#define LOG_NDDEBUG 0

		#include <stdlib.h>
		#include <errno.h>
		#include <dlfcn.h>
		#include <cutils/properties.h>
		#include <cutils/log.h>

		#include "audio_hw.h"
		#include "audio_extn.h"
		#include "platform.h"
		#include "platform_api.h"



		#ifdef KPI_OPTIMIZE_ENABLED
		typedef int (perf_lock_acquire_t)(int, int, int, int);
		typedef int (*perf_lock_release_t)(int);

		static void *qcopt_handle;
		static perf_lock_acquire_t perf_lock_acq;
		static perf_lock_release_t perf_lock_rel;

		static int perf_lock_handle;
		char opt_lib_path[PROPERTY_VALUE_MAX] = {0};

		int perf_lock_opts[] = {0x101, 0x20E, 0x30E};

		int audio_extn_perf_lock_init(void)
		{
		int ret = 0;
		if (qcopt_handle == NULL) {
		if (property_get("ro.vendor.extension_library",
		opt_lib_path, NULL) <= 0) {
		ALOGE("%s: Failed getting perf property", __func__);
		ret = -EINVAL;
		goto err;
		}
		if ((qcopt_handle = dlopen(opt_lib_path, RTLD_NOW)) == NULL) {
		ALOGE("%s: Failed to open perf handle", __func__);
		ret = -EINVAL;
		goto err;
		} else {
		perf_lock_acq = (perf_lock_acquire_t)dlsym(qcopt_handle,
		"perf_lock_acq");
		if (perf_lock_acq == NULL) {
		ALOGE("%s: Perf lock Acquire NULL", __func__);
		ret = -EINVAL;
		goto err;
		}
		perf_lock_rel = (perf_lock_release_t)dlsym(qcopt_handle,
		"perf_lock_rel");
		if (perf_lock_rel == NULL) {
		ALOGE("%s: Perf lock Release NULL", __func__);
		ret = -EINVAL;
		goto err;
		}
		ALOGD("%s: Perf lock handles Success", __func__);
		}
		}
		err:
		return ret;
		}

		void audio_extn_perf_lock_acquire(void)
		{
		if (perf_lock_acq) {
		perf_lock_handle = perf_lock_acq(perf_lock_handle, 0, perf_lock_opts, 3);
		ALOGV("%s: Perf lock acquired", __func__);
		} else {
		ALOGE("%s: Perf lock acquire error", __func__);
		}
		}

		void audio_extn_perf_lock_release(void)
		{
		if (perf_lock_rel && perf_lock_handle) {
		perf_lock_rel(perf_lock_handle);
		ALOGV("%s: Perf lock released", __func__);
		} else {
		ALOGE("%s: Perf lock release error", __func__);
		}
		}
		#endif /* KPI_OPTIMIZE_ENABLED */

hal/audio_extn/audio_extn.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -101,4 +101,13 @@ void audio_extn_dsm_feedback_enable(struct audio_device *adev,
		void audio_extn_hwdep_cal_send(int snd_card, void *acdb_handle);
		#endif

		#ifndef KPI_OPTIMIZE_ENABLED
		#define audio_extn_perf_lock_init() (0)
		#define audio_extn_perf_lock_acquire() (0)
		#define audio_extn_perf_lock_release() (0)
		#else
		int audio_extn_perf_lock_init(void);
		void audio_extn_perf_lock_acquire(void);
		void audio_extn_perf_lock_release(void);
		#endif /* KPI_OPTIMIZE_ENABLED */
		#endif /* AUDIO_EXTN_H */

hal/audio_extn/soundtrigger.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -209,12 +209,14 @@ void audio_extn_sound_trigger_update_device_status(snd_device_t snd_device,
		return;

		if (snd_device >= SND_DEVICE_OUT_BEGIN &&
		snd_device < SND_DEVICE_OUT_END)
		snd_device < SND_DEVICE_OUT_END) {
		device_type = PCM_PLAYBACK;
		else if (snd_device >= SND_DEVICE_IN_BEGIN &&
		snd_device < SND_DEVICE_IN_END)
		} else if (snd_device >= SND_DEVICE_IN_BEGIN &&
		snd_device < SND_DEVICE_IN_END) {
		if (snd_device == SND_DEVICE_IN_CAPTURE_VI_FEEDBACK)
		return;
		device_type = PCM_CAPTURE;
		else {
		} else {
		ALOGE("%s: invalid device 0x%x, for event %d",
		__func__, snd_device, event);
		return;

hal/audio_hw.c

+154 −36

File changed.

Preview size limit exceeded, changes collapsed.