From abdad403d0836fddea1b883838af244e4f74691b Mon Sep 17 00:00:00 2001 From: Rohit Date: Fri, 17 Mar 2023 14:44:12 +0530 Subject: [PATCH 1/7] FP4: Switch to source built audio HAL * Avoid unnecessary edits on HAL source for custom config filenames like on stock --- BoardConfig.mk | 3 +++ audio/audio_platform_info_lagoon_fp4.xml | 2 -- device.mk | 4 ++-- proprietary-files.txt | 20 +++++++------------- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index ef2a80e..101b330 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -41,11 +41,14 @@ AB_OTA_PARTITIONS += \ # Audio AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true +AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true AUDIO_FEATURE_ENABLED_HDMI_SPK := true AUDIO_FEATURE_ENABLED_INSTANCE_ID := true AUDIO_FEATURE_ENABLED_SSR := true AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true +BOARD_USES_ALSA_AUDIO := true +BOARD_SUPPORTS_SOUND_TRIGGER := true USE_CUSTOM_AUDIO_POLICY := 1 # Bluetooth diff --git a/audio/audio_platform_info_lagoon_fp4.xml b/audio/audio_platform_info_lagoon_fp4.xml index 51d3f69..a11abc3 100644 --- a/audio/audio_platform_info_lagoon_fp4.xml +++ b/audio/audio_platform_info_lagoon_fp4.xml @@ -87,7 +87,6 @@ - @@ -131,7 +130,6 @@ - diff --git a/device.mk b/device.mk index 9369a78..c6b773b 100644 --- a/device.mk +++ b/device.mk @@ -153,11 +153,11 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ $(LOCAL_PATH)/audio/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \ - $(LOCAL_PATH)/audio/audio_platform_info_lagoon_fp4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_lagoon_fp4.xml \ + $(LOCAL_PATH)/audio/audio_platform_info_lagoon_fp4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \ $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ $(LOCAL_PATH)/audio/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ $(LOCAL_PATH)/audio/bluetooth_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_hearing_aid_audio_policy_configuration.xml \ - $(LOCAL_PATH)/audio/mixer_paths_lagoon_fp4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_lagoon_fp4.xml \ + $(LOCAL_PATH)/audio/mixer_paths_lagoon_fp4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_lagoonmtp.xml \ $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml diff --git a/proprietary-files.txt b/proprietary-files.txt index 14fb0e4..6cdcf1f 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,13 +1,13 @@ # Unpinned blobs from Fairphone/FP4eea/FP4:12/SKQ1.220201.001/SP21:user/release-keys # ACDB -vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/Bluetooth_cal.acdb -vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/General_cal.acdb -vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/Global_cal.acdb -vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/Handset_cal.acdb -vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/Hdmi_cal.acdb -vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/Headset_cal.acdb -vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/Speaker_cal.acdb +vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/Bluetooth_cal.acdb:vendor/etc/acdbdata/MTP/lito-lagoonmtp-snd-card/Bluetooth_cal.acdb +vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/General_cal.acdb:vendor/etc/acdbdata/MTP/lito-lagoonmtp-snd-card/General_cal.acdb +vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/Global_cal.acdb:vendor/etc/acdbdata/MTP/lito-lagoonmtp-snd-card/Global_cal.acdb +vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/Handset_cal.acdb:vendor/etc/acdbdata/MTP/lito-lagoonmtp-snd-card/Handset_cal.acdb +vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/Hdmi_cal.acdb:vendor/etc/acdbdata/MTP/lito-lagoonmtp-snd-card/Hdmi_cal.acdb +vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/Headset_cal.acdb:vendor/etc/acdbdata/MTP/lito-lagoonmtp-snd-card/Headset_cal.acdb +vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/Speaker_cal.acdb:vendor/etc/acdbdata/MTP/lito-lagoonmtp-snd-card/Speaker_cal.acdb vendor/etc/acdbdata/adsp_avs_config.acdb # ADSP @@ -42,12 +42,6 @@ vendor/lib/libadiertac.so vendor/lib/libadm.so vendor/lib/libaudcal.so vendor/lib/libqtigef.so -vendor/lib/libssrec.so - -# Audio (Hardware) -vendor/lib/hw/audio.primary.lito.so -vendor/lib/liba2dpoffload.so -vendor/lib/libaudio_log_utils.so # Audio (Firmware) vendor/firmware/aw882xx_monitor.bin -- GitLab From 7f93db15cc380bad9af0d966fe029fd661e69575 Mon Sep 17 00:00:00 2001 From: PIPIPIG233666 Date: Fri, 14 Feb 2020 22:39:33 -0500 Subject: [PATCH 2/7] Add custom audio amplifier for TFA amp feedback * Based on observing reverse engineering from davinci stock audio HAL. * Fixes speaker distortion on high volume. * Same logic with Smosia, rewritten by me. Co-authored-by: Smosia Change-Id: I369555a9fcb06065177636b436d2e006c7a0b07d --- audio_amplifier/Android.mk | 54 +++++++ audio_amplifier/audio_amplifier.c | 231 ++++++++++++++++++++++++++++++ 2 files changed, 285 insertions(+) create mode 100644 audio_amplifier/Android.mk create mode 100644 audio_amplifier/audio_amplifier.c diff --git a/audio_amplifier/Android.mk b/audio_amplifier/Android.mk new file mode 100644 index 0000000..fa8a8b5 --- /dev/null +++ b/audio_amplifier/Android.mk @@ -0,0 +1,54 @@ +# +# Copyright 2020 The LineageOS 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. +# + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_SHARED_LIBRARIES := \ + libbase \ + liblog \ + libcutils \ + libtinyalsa \ + libtinycompress \ + libaudioroute \ + libdl \ + libaudioutils \ + libhwbinder \ + libhidlbase \ + libprocessgroup \ + libutils \ + audio.primary.$(TARGET_BOARD_PLATFORM) + +LOCAL_C_INCLUDES += \ + external/tinyalsa/include \ + external/tinycompress/include \ + hardware/libhardware/include \ + system/media/audio_utils/include \ + $(call include-path-for, audio-effects) \ + $(call include-path-for, audio-route) \ + $(call project-path-for,qcom-audio)/hal \ + $(call project-path-for,qcom-audio)/hal/msm8974 \ + $(call project-path-for,qcom-audio)/hal/audio_extn \ + $(call project-path-for,qcom-audio)/hal/voice_extn + +LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_SRC_FILES := audio_amplifier.c +LOCAL_MODULE := audio_amplifier.$(TARGET_BOARD_PLATFORM) +LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_MODULE_TAGS := optional +LOCAL_VENDOR_MODULE := true + +include $(BUILD_SHARED_LIBRARY) diff --git a/audio_amplifier/audio_amplifier.c b/audio_amplifier/audio_amplifier.c new file mode 100644 index 0000000..f9d51f2 --- /dev/null +++ b/audio_amplifier/audio_amplifier.c @@ -0,0 +1,231 @@ +/* + * Copyright (C) 2015 The CyanogenMod Project + * Copyright (C) 2020 The LineageOS 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_amplifier" +//#define LOG_NDEBUG 0 + +#include +#include +#include +#include +#include +#include +#include + +/* clang-format off */ +#include "audio_hw.h" +#include "platform.h" +#include "platform_api.h" +/* clang-format on */ + +#define UNUSED __attribute__((unused)) + +typedef struct amp_device { + amplifier_device_t amp_dev; + struct audio_device* adev; + struct audio_usecase* usecase_tx; + struct pcm* tfa98xx_out; +} tfa_t; + +static tfa_t* tfa_dev = NULL; + +static int is_speaker(uint32_t snd_device) { + int speaker = 0; + switch (snd_device) { + case SND_DEVICE_OUT_SPEAKER: + case SND_DEVICE_OUT_SPEAKER_REVERSE: + case SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES: + case SND_DEVICE_OUT_VOICE_SPEAKER: + case SND_DEVICE_OUT_VOICE_SPEAKER_2: + case SND_DEVICE_OUT_SPEAKER_AND_HDMI: + case SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET: + case SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET: + speaker = 1; + break; + } + + return speaker; +} + +int tfa98xx_start_feedback(void* adev, uint32_t snd_device) { + tfa_dev->adev = (struct audio_device*)adev; + int pcm_dev_tx_id = 0, rc = 0; + struct pcm_config pcm_config_tfa98xx = { + .channels = 2, + .rate = 48000, + .period_size = 256, + .period_count = 4, + .format = PCM_FORMAT_S16_LE, + .start_threshold = 0, + .stop_threshold = INT_MAX, + .silence_threshold = 0, + }; + + if (!tfa_dev) { + ALOGE("%d: Invalid params", __LINE__); + return -EINVAL; + } + + if (tfa_dev->tfa98xx_out || !is_speaker(snd_device)) return 0; + + tfa_dev->usecase_tx = (struct audio_usecase*)calloc(1, sizeof(struct audio_usecase)); + if (!tfa_dev->usecase_tx) { + ALOGE("%d: failed to allocate usecase", __LINE__); + return -ENOMEM; + } + tfa_dev->usecase_tx->id = USECASE_AUDIO_SPKR_CALIB_TX; + tfa_dev->usecase_tx->type = PCM_CAPTURE; + tfa_dev->usecase_tx->in_snd_device = SND_DEVICE_IN_CAPTURE_VI_FEEDBACK; + + list_add_tail(&tfa_dev->adev->usecase_list, &tfa_dev->usecase_tx->list); + enable_snd_device(tfa_dev->adev, tfa_dev->usecase_tx->in_snd_device); + enable_audio_route(tfa_dev->adev, tfa_dev->usecase_tx); + + pcm_dev_tx_id = platform_get_pcm_device_id(tfa_dev->usecase_tx->id, tfa_dev->usecase_tx->type); + ALOGD("pcm_dev_tx_id = %d", pcm_dev_tx_id); + if (pcm_dev_tx_id < 0) { + ALOGE("%d: Invalid pcm device for usecase (%d)", __LINE__, tfa_dev->usecase_tx->id); + rc = -ENODEV; + goto error; + } + + tfa_dev->tfa98xx_out = + pcm_open(tfa_dev->adev->snd_card, pcm_dev_tx_id, PCM_IN, &pcm_config_tfa98xx); + if (!(tfa_dev->tfa98xx_out || pcm_is_ready(tfa_dev->tfa98xx_out))) { + ALOGE("%d: %s", __LINE__, pcm_get_error(tfa_dev->tfa98xx_out)); + rc = -EIO; + goto error; + } + + rc = pcm_start(tfa_dev->tfa98xx_out); + if (rc < 0) { + ALOGE("%d: pcm start for TX failed", __LINE__); + rc = -EINVAL; + goto error; + } + return 0; + +error: + ALOGE("%s: error case", __func__); + if (tfa_dev->tfa98xx_out != 0) { + pcm_close(tfa_dev->tfa98xx_out); + tfa_dev->tfa98xx_out = NULL; + } + list_remove(&tfa_dev->usecase_tx->list); + disable_snd_device(tfa_dev->adev, tfa_dev->usecase_tx->in_snd_device); + disable_audio_route(tfa_dev->adev, tfa_dev->usecase_tx); + free(tfa_dev->usecase_tx); + + return rc; +} + +void tfa98xx_stop_feedback(void* adev, uint32_t snd_device) { + tfa_dev->adev = (struct audio_device*)adev; + if (!tfa_dev) { + ALOGE("%s: Invalid params", __func__); + return; + } + + if (!is_speaker(snd_device)) return; + + if (tfa_dev->tfa98xx_out) { + pcm_close(tfa_dev->tfa98xx_out); + tfa_dev->tfa98xx_out = NULL; + } + + disable_snd_device(tfa_dev->adev, SND_DEVICE_IN_CAPTURE_VI_FEEDBACK); + + tfa_dev->usecase_tx = get_usecase_from_list(tfa_dev->adev, USECASE_AUDIO_SPKR_CALIB_TX); + if (tfa_dev->usecase_tx) { + list_remove(&tfa_dev->usecase_tx->list); + disable_audio_route(tfa_dev->adev, tfa_dev->usecase_tx); + free(tfa_dev->usecase_tx); + } + return; +} + +static int amp_set_feedback(UNUSED amplifier_device_t* device, void* adev, uint32_t devices, + bool enable) { + tfa_dev->adev = (struct audio_device*)adev; + if (enable) { + tfa98xx_start_feedback(tfa_dev->adev, devices); + } else { + tfa98xx_stop_feedback(tfa_dev->adev, devices); + } + return 0; +} + +static int amp_dev_close(hw_device_t* device) { + tfa_t* dev = (tfa_t*)device; + if (dev) free(dev); + + return 0; +} + +static int amp_module_open(const hw_module_t* module, const char* name, hw_device_t** device) { + if (strcmp(name, AMPLIFIER_HARDWARE_INTERFACE)) { + ALOGE("%s:%d: %s does not match amplifier hardware interface name\n", __func__, __LINE__, + name); + return -ENODEV; + } + + tfa_dev = calloc(1, sizeof(tfa_t)); + if (!tfa_dev) { + ALOGE("%s:%d: Unable to allocate memory for amplifier device\n", __func__, __LINE__); + return -ENOMEM; + } + + tfa_dev->amp_dev.common.tag = HARDWARE_DEVICE_TAG; + tfa_dev->amp_dev.common.module = (hw_module_t*)module; + tfa_dev->amp_dev.common.version = HARDWARE_DEVICE_API_VERSION(1, 0); + tfa_dev->amp_dev.common.close = amp_dev_close; + + tfa_dev->amp_dev.set_input_devices = NULL; + tfa_dev->amp_dev.set_output_devices = NULL; + tfa_dev->amp_dev.enable_output_devices = NULL; + tfa_dev->amp_dev.enable_input_devices = NULL; + tfa_dev->amp_dev.set_mode = NULL; + tfa_dev->amp_dev.output_stream_start = NULL; + tfa_dev->amp_dev.input_stream_start = NULL; + tfa_dev->amp_dev.output_stream_standby = NULL; + tfa_dev->amp_dev.input_stream_standby = NULL; + tfa_dev->amp_dev.set_parameters = NULL; + tfa_dev->amp_dev.out_set_parameters = NULL; + tfa_dev->amp_dev.in_set_parameters = NULL; + tfa_dev->amp_dev.set_feedback = amp_set_feedback; + + *device = (hw_device_t*)tfa_dev; + + return 0; +} + +static struct hw_module_methods_t hal_module_methods = { + .open = amp_module_open, +}; + +/* clang-format off */ +amplifier_module_t HAL_MODULE_INFO_SYM = { + .common = { + .tag = HARDWARE_MODULE_TAG, + .module_api_version = AMPLIFIER_MODULE_API_VERSION_0_1, + .hal_api_version = HARDWARE_HAL_API_VERSION, + .id = AMPLIFIER_HARDWARE_MODULE_ID, + .name = "TFA98XX audio amplifier HAL", + .author = "The LineageOS Project", + .methods = &hal_module_methods, + }, +}; -- GitLab From f3b4f225cc4796402db118295e167e32abe1c7e8 Mon Sep 17 00:00:00 2001 From: Pig Date: Tue, 3 Nov 2020 21:07:33 +0800 Subject: [PATCH 3/7] amplifier: Fix device list initializations Update missing device list initializations. Reported-by: Signed-off-by: SayanAcharya Co-authored-by: Signed-off-by: SayanAcharya Change-Id: Iaa44429e7a2514f882828089355fca1634b79200 --- audio_amplifier/audio_amplifier.c | 1 + 1 file changed, 1 insertion(+) diff --git a/audio_amplifier/audio_amplifier.c b/audio_amplifier/audio_amplifier.c index f9d51f2..b19641f 100644 --- a/audio_amplifier/audio_amplifier.c +++ b/audio_amplifier/audio_amplifier.c @@ -90,6 +90,7 @@ int tfa98xx_start_feedback(void* adev, uint32_t snd_device) { tfa_dev->usecase_tx->id = USECASE_AUDIO_SPKR_CALIB_TX; tfa_dev->usecase_tx->type = PCM_CAPTURE; tfa_dev->usecase_tx->in_snd_device = SND_DEVICE_IN_CAPTURE_VI_FEEDBACK; + list_init(&tfa_dev->usecase_tx->device_list); list_add_tail(&tfa_dev->adev->usecase_list, &tfa_dev->usecase_tx->list); enable_snd_device(tfa_dev->adev, tfa_dev->usecase_tx->in_snd_device); -- GitLab From 124a6041f455686041cc5b0031cfc4ad86bc6bc4 Mon Sep 17 00:00:00 2001 From: Rohit Date: Mon, 20 Mar 2023 15:19:04 +0530 Subject: [PATCH 4/7] audio_amplifier: Rebrand to AW882xx * AW882xx logic was the same as the TFA one anyways --- audio_amplifier/audio_amplifier.c | 140 +++++++++++++++--------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/audio_amplifier/audio_amplifier.c b/audio_amplifier/audio_amplifier.c index b19641f..8c40af2 100644 --- a/audio_amplifier/audio_amplifier.c +++ b/audio_amplifier/audio_amplifier.c @@ -38,10 +38,10 @@ typedef struct amp_device { amplifier_device_t amp_dev; struct audio_device* adev; struct audio_usecase* usecase_tx; - struct pcm* tfa98xx_out; -} tfa_t; + struct pcm* aw882xx_out; +} aw_t; -static tfa_t* tfa_dev = NULL; +static aw_t* aw_dev = NULL; static int is_speaker(uint32_t snd_device) { int speaker = 0; @@ -61,10 +61,10 @@ static int is_speaker(uint32_t snd_device) { return speaker; } -int tfa98xx_start_feedback(void* adev, uint32_t snd_device) { - tfa_dev->adev = (struct audio_device*)adev; +int aw882xx_start_feedback(void* adev, uint32_t snd_device) { + aw_dev->adev = (struct audio_device*)adev; int pcm_dev_tx_id = 0, rc = 0; - struct pcm_config pcm_config_tfa98xx = { + struct pcm_config pcm_config_aw882xx = { .channels = 2, .rate = 48000, .period_size = 256, @@ -75,44 +75,44 @@ int tfa98xx_start_feedback(void* adev, uint32_t snd_device) { .silence_threshold = 0, }; - if (!tfa_dev) { + if (!aw_dev) { ALOGE("%d: Invalid params", __LINE__); return -EINVAL; } - if (tfa_dev->tfa98xx_out || !is_speaker(snd_device)) return 0; + if (aw_dev->aw882xx_out || !is_speaker(snd_device)) return 0; - tfa_dev->usecase_tx = (struct audio_usecase*)calloc(1, sizeof(struct audio_usecase)); - if (!tfa_dev->usecase_tx) { + aw_dev->usecase_tx = (struct audio_usecase*)calloc(1, sizeof(struct audio_usecase)); + if (!aw_dev->usecase_tx) { ALOGE("%d: failed to allocate usecase", __LINE__); return -ENOMEM; } - tfa_dev->usecase_tx->id = USECASE_AUDIO_SPKR_CALIB_TX; - tfa_dev->usecase_tx->type = PCM_CAPTURE; - tfa_dev->usecase_tx->in_snd_device = SND_DEVICE_IN_CAPTURE_VI_FEEDBACK; - list_init(&tfa_dev->usecase_tx->device_list); + aw_dev->usecase_tx->id = USECASE_AUDIO_SPKR_CALIB_TX; + aw_dev->usecase_tx->type = PCM_CAPTURE; + aw_dev->usecase_tx->in_snd_device = SND_DEVICE_IN_CAPTURE_VI_FEEDBACK; + list_init(&aw_dev->usecase_tx->device_list); - list_add_tail(&tfa_dev->adev->usecase_list, &tfa_dev->usecase_tx->list); - enable_snd_device(tfa_dev->adev, tfa_dev->usecase_tx->in_snd_device); - enable_audio_route(tfa_dev->adev, tfa_dev->usecase_tx); + list_add_tail(&aw_dev->adev->usecase_list, &aw_dev->usecase_tx->list); + enable_snd_device(aw_dev->adev, aw_dev->usecase_tx->in_snd_device); + enable_audio_route(aw_dev->adev, aw_dev->usecase_tx); - pcm_dev_tx_id = platform_get_pcm_device_id(tfa_dev->usecase_tx->id, tfa_dev->usecase_tx->type); + pcm_dev_tx_id = platform_get_pcm_device_id(aw_dev->usecase_tx->id, aw_dev->usecase_tx->type); ALOGD("pcm_dev_tx_id = %d", pcm_dev_tx_id); if (pcm_dev_tx_id < 0) { - ALOGE("%d: Invalid pcm device for usecase (%d)", __LINE__, tfa_dev->usecase_tx->id); + ALOGE("%d: Invalid pcm device for usecase (%d)", __LINE__, aw_dev->usecase_tx->id); rc = -ENODEV; goto error; } - tfa_dev->tfa98xx_out = - pcm_open(tfa_dev->adev->snd_card, pcm_dev_tx_id, PCM_IN, &pcm_config_tfa98xx); - if (!(tfa_dev->tfa98xx_out || pcm_is_ready(tfa_dev->tfa98xx_out))) { - ALOGE("%d: %s", __LINE__, pcm_get_error(tfa_dev->tfa98xx_out)); + aw_dev->aw882xx_out = + pcm_open(aw_dev->adev->snd_card, pcm_dev_tx_id, PCM_IN, &pcm_config_aw882xx); + if (!(aw_dev->aw882xx_out || pcm_is_ready(aw_dev->aw882xx_out))) { + ALOGE("%d: %s", __LINE__, pcm_get_error(aw_dev->aw882xx_out)); rc = -EIO; goto error; } - rc = pcm_start(tfa_dev->tfa98xx_out); + rc = pcm_start(aw_dev->aw882xx_out); if (rc < 0) { ALOGE("%d: pcm start for TX failed", __LINE__); rc = -EINVAL; @@ -122,56 +122,56 @@ int tfa98xx_start_feedback(void* adev, uint32_t snd_device) { error: ALOGE("%s: error case", __func__); - if (tfa_dev->tfa98xx_out != 0) { - pcm_close(tfa_dev->tfa98xx_out); - tfa_dev->tfa98xx_out = NULL; + if (aw_dev->aw882xx_out != 0) { + pcm_close(aw_dev->aw882xx_out); + aw_dev->aw882xx_out = NULL; } - list_remove(&tfa_dev->usecase_tx->list); - disable_snd_device(tfa_dev->adev, tfa_dev->usecase_tx->in_snd_device); - disable_audio_route(tfa_dev->adev, tfa_dev->usecase_tx); - free(tfa_dev->usecase_tx); + list_remove(&aw_dev->usecase_tx->list); + disable_snd_device(aw_dev->adev, aw_dev->usecase_tx->in_snd_device); + disable_audio_route(aw_dev->adev, aw_dev->usecase_tx); + free(aw_dev->usecase_tx); return rc; } -void tfa98xx_stop_feedback(void* adev, uint32_t snd_device) { - tfa_dev->adev = (struct audio_device*)adev; - if (!tfa_dev) { +void aw882xx_stop_feedback(void* adev, uint32_t snd_device) { + aw_dev->adev = (struct audio_device*)adev; + if (!aw_dev) { ALOGE("%s: Invalid params", __func__); return; } if (!is_speaker(snd_device)) return; - if (tfa_dev->tfa98xx_out) { - pcm_close(tfa_dev->tfa98xx_out); - tfa_dev->tfa98xx_out = NULL; + if (aw_dev->aw882xx_out) { + pcm_close(aw_dev->aw882xx_out); + aw_dev->aw882xx_out = NULL; } - disable_snd_device(tfa_dev->adev, SND_DEVICE_IN_CAPTURE_VI_FEEDBACK); + disable_snd_device(aw_dev->adev, SND_DEVICE_IN_CAPTURE_VI_FEEDBACK); - tfa_dev->usecase_tx = get_usecase_from_list(tfa_dev->adev, USECASE_AUDIO_SPKR_CALIB_TX); - if (tfa_dev->usecase_tx) { - list_remove(&tfa_dev->usecase_tx->list); - disable_audio_route(tfa_dev->adev, tfa_dev->usecase_tx); - free(tfa_dev->usecase_tx); + aw_dev->usecase_tx = get_usecase_from_list(aw_dev->adev, USECASE_AUDIO_SPKR_CALIB_TX); + if (aw_dev->usecase_tx) { + list_remove(&aw_dev->usecase_tx->list); + disable_audio_route(aw_dev->adev, aw_dev->usecase_tx); + free(aw_dev->usecase_tx); } return; } static int amp_set_feedback(UNUSED amplifier_device_t* device, void* adev, uint32_t devices, bool enable) { - tfa_dev->adev = (struct audio_device*)adev; + aw_dev->adev = (struct audio_device*)adev; if (enable) { - tfa98xx_start_feedback(tfa_dev->adev, devices); + aw882xx_start_feedback(aw_dev->adev, devices); } else { - tfa98xx_stop_feedback(tfa_dev->adev, devices); + aw882xx_stop_feedback(aw_dev->adev, devices); } return 0; } static int amp_dev_close(hw_device_t* device) { - tfa_t* dev = (tfa_t*)device; + aw_t* dev = (aw_t*)device; if (dev) free(dev); return 0; @@ -184,32 +184,32 @@ static int amp_module_open(const hw_module_t* module, const char* name, hw_devic return -ENODEV; } - tfa_dev = calloc(1, sizeof(tfa_t)); - if (!tfa_dev) { + aw_dev = calloc(1, sizeof(aw_t)); + if (!aw_dev) { ALOGE("%s:%d: Unable to allocate memory for amplifier device\n", __func__, __LINE__); return -ENOMEM; } - tfa_dev->amp_dev.common.tag = HARDWARE_DEVICE_TAG; - tfa_dev->amp_dev.common.module = (hw_module_t*)module; - tfa_dev->amp_dev.common.version = HARDWARE_DEVICE_API_VERSION(1, 0); - tfa_dev->amp_dev.common.close = amp_dev_close; - - tfa_dev->amp_dev.set_input_devices = NULL; - tfa_dev->amp_dev.set_output_devices = NULL; - tfa_dev->amp_dev.enable_output_devices = NULL; - tfa_dev->amp_dev.enable_input_devices = NULL; - tfa_dev->amp_dev.set_mode = NULL; - tfa_dev->amp_dev.output_stream_start = NULL; - tfa_dev->amp_dev.input_stream_start = NULL; - tfa_dev->amp_dev.output_stream_standby = NULL; - tfa_dev->amp_dev.input_stream_standby = NULL; - tfa_dev->amp_dev.set_parameters = NULL; - tfa_dev->amp_dev.out_set_parameters = NULL; - tfa_dev->amp_dev.in_set_parameters = NULL; - tfa_dev->amp_dev.set_feedback = amp_set_feedback; - - *device = (hw_device_t*)tfa_dev; + aw_dev->amp_dev.common.tag = HARDWARE_DEVICE_TAG; + aw_dev->amp_dev.common.module = (hw_module_t*)module; + aw_dev->amp_dev.common.version = HARDWARE_DEVICE_API_VERSION(1, 0); + aw_dev->amp_dev.common.close = amp_dev_close; + + aw_dev->amp_dev.set_input_devices = NULL; + aw_dev->amp_dev.set_output_devices = NULL; + aw_dev->amp_dev.enable_output_devices = NULL; + aw_dev->amp_dev.enable_input_devices = NULL; + aw_dev->amp_dev.set_mode = NULL; + aw_dev->amp_dev.output_stream_start = NULL; + aw_dev->amp_dev.input_stream_start = NULL; + aw_dev->amp_dev.output_stream_standby = NULL; + aw_dev->amp_dev.input_stream_standby = NULL; + aw_dev->amp_dev.set_parameters = NULL; + aw_dev->amp_dev.out_set_parameters = NULL; + aw_dev->amp_dev.in_set_parameters = NULL; + aw_dev->amp_dev.set_feedback = amp_set_feedback; + + *device = (hw_device_t*)aw_dev; return 0; } @@ -225,7 +225,7 @@ amplifier_module_t HAL_MODULE_INFO_SYM = { .module_api_version = AMPLIFIER_MODULE_API_VERSION_0_1, .hal_api_version = HARDWARE_HAL_API_VERSION, .id = AMPLIFIER_HARDWARE_MODULE_ID, - .name = "TFA98XX audio amplifier HAL", + .name = "AW882XX audio amplifier HAL", .author = "The LineageOS Project", .methods = &hal_module_methods, }, -- GitLab From ad5d3c839281219643ac2f8ffa7b79026e6d9bd0 Mon Sep 17 00:00:00 2001 From: Alexander Koskovich Date: Tue, 2 Mar 2021 08:45:17 -0700 Subject: [PATCH 5/7] amplifier: Clean up makefile. Change-Id: I416005aec3e4b6a686079d7e4796e5b548ee0e9f --- audio_amplifier/Android.mk | 50 +++++++++++++++----------------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/audio_amplifier/Android.mk b/audio_amplifier/Android.mk index fa8a8b5..c669344 100644 --- a/audio_amplifier/Android.mk +++ b/audio_amplifier/Android.mk @@ -1,5 +1,5 @@ # -# Copyright 2020 The LineageOS Project +# Copyright 2020-2021 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,38 +17,28 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_SHARED_LIBRARIES := \ - libbase \ - liblog \ - libcutils \ - libtinyalsa \ - libtinycompress \ - libaudioroute \ - libdl \ - libaudioutils \ - libhwbinder \ - libhidlbase \ - libprocessgroup \ - libutils \ - audio.primary.$(TARGET_BOARD_PLATFORM) -LOCAL_C_INCLUDES += \ - external/tinyalsa/include \ - external/tinycompress/include \ - hardware/libhardware/include \ - system/media/audio_utils/include \ - $(call include-path-for, audio-effects) \ - $(call include-path-for, audio-route) \ - $(call project-path-for,qcom-audio)/hal \ - $(call project-path-for,qcom-audio)/hal/msm8974 \ - $(call project-path-for,qcom-audio)/hal/audio_extn \ - $(call project-path-for,qcom-audio)/hal/voice_extn - -LOCAL_HEADER_LIBRARIES := generated_kernel_headers -LOCAL_SRC_FILES := audio_amplifier.c LOCAL_MODULE := audio_amplifier.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_MODULE_TAGS := optional +LOCAL_SRC_FILES := audio_amplifier.c LOCAL_VENDOR_MODULE := true +LOCAL_C_INCLUDES += \ + $(call include-path-for, audio-route) \ + $(call include-path-for, audio-utils) \ + $(call project-path-for, qcom-audio)/hal \ + $(call project-path-for, qcom-audio)/hal/audio_extn \ + $(call project-path-for, qcom-audio)/hal/msm8974 \ + external/tinycompress/include + +LOCAL_HEADER_LIBRARIES += \ + generated_kernel_headers \ + libhardware_headers + +LOCAL_SHARED_LIBRARIES += \ + audio.primary.$(TARGET_BOARD_PLATFORM) \ + libcutils \ + liblog \ + libtinyalsa + include $(BUILD_SHARED_LIBRARY) -- GitLab From f4b869ef9d8e5e6c166afe7287ae4634dec0fffa Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Mon, 11 Jul 2022 11:27:20 -0700 Subject: [PATCH 6/7] amplifier: Add (and run) clang-format file Change-Id: Iaa76db2b802de191e5b494fc0ec91988efc13ff5 --- audio_amplifier/.clang-format | 1 + 1 file changed, 1 insertion(+) create mode 120000 audio_amplifier/.clang-format diff --git a/audio_amplifier/.clang-format b/audio_amplifier/.clang-format new file mode 120000 index 0000000..973b2fa --- /dev/null +++ b/audio_amplifier/.clang-format @@ -0,0 +1 @@ +../../../build/soong/scripts/system-clang-format \ No newline at end of file -- GitLab From 41e8ba0fd80c5c2ca4eb3e27f5cf2e1306d4583f Mon Sep 17 00:00:00 2001 From: Rohit Date: Mon, 20 Mar 2023 16:00:09 +0530 Subject: [PATCH 7/7] audio_amplifier: Build it --- BoardConfig.mk | 1 + device.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/BoardConfig.mk b/BoardConfig.mk index 101b330..c746ef8 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -40,6 +40,7 @@ AB_OTA_PARTITIONS += \ vendor # Audio +AUDIO_FEATURE_ENABLED_EXT_AMPLIFIER := true AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true diff --git a/device.mk b/device.mk index c6b773b..3492371 100644 --- a/device.mk +++ b/device.mk @@ -120,6 +120,7 @@ PRODUCT_PACKAGES += \ # Audio (Hardware) PRODUCT_PACKAGES += \ audio.a2dp.default \ + audio_amplifier.lito \ audio.primary.lito \ audio.r_submix.default \ audio.usb.default -- GitLab