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

Commit f1852b6d authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

Merge branch '490devices-s-fp4_oss_audio' into 'v1-s' 

FP4: Switch to source built audio HAL

See merge request !33
parents 97c05ac9 41e8ba0f

BoardConfig.mk

+4 −0
Original line number Diff line number Diff line
@@ -40,12 +40,16 @@ 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

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

audio/audio_platform_info_lagoon_fp4.xml

+0 −2
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ 
        <device name="SND_DEVICE_OUT_HANDSET" acdb_id="7"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET" acdb_id="7"/>

        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>

        <device name="SND_DEVICE_OUT_VOICE_HAC" acdb_id="53"/>

        <device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" acdb_id="53"/>

        <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="15"/>

        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="124"/>
@@ -131,7 +130,6 @@ 
        <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_HANDSET" backend="handset" interface="QUIN_MI2S_RX"/>

        <device name="SND_DEVICE_OUT_VOICE_HAC" backend="voice-hac" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" backend="voice-hac-handset" interface="QUIN_MI2S_RX-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER" interface="QUIN_MI2S_RX"/>

        <device name="SND_DEVICE_CAPTURE_VI_FEEDBACK" interface="QUIN_MI2S_TX"/>

audio_amplifier/.clang-format

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../../build/soong/scripts/system-clang-format
 
 No newline at end of file

audio_amplifier/Android.mk

0 → 100644
+44 −0
Original line number Diff line number Diff line 
#

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

# 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_MODULE := audio_amplifier.$(TARGET_BOARD_PLATFORM)

LOCAL_MODULE_RELATIVE_PATH := hw

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)

audio_amplifier/audio_amplifier.c

0 → 100644
+232 −0
Original line number Diff line number Diff line 
/*

 * 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 <cutils/str_parms.h>

#include <hardware/audio_amplifier.h>

#include <hardware/hardware.h>

#include <log/log.h>

#include <stdint.h>

#include <stdlib.h>

#include <sys/types.h>



/* 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* aw882xx_out;

} aw_t;



static aw_t* aw_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 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_aw882xx = {

            .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 (!aw_dev) {

        ALOGE("%d: Invalid params", __LINE__);

        return -EINVAL;

    }



    if (aw_dev->aw882xx_out || !is_speaker(snd_device)) return 0;



    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;

    }

    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(&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(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__, aw_dev->usecase_tx->id);

        rc = -ENODEV;

        goto error;

    }



    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(aw_dev->aw882xx_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 (aw_dev->aw882xx_out != 0) {

        pcm_close(aw_dev->aw882xx_out);

        aw_dev->aw882xx_out = NULL;

    }

    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 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 (aw_dev->aw882xx_out) {

        pcm_close(aw_dev->aw882xx_out);

        aw_dev->aw882xx_out = NULL;

    }



    disable_snd_device(aw_dev->adev, SND_DEVICE_IN_CAPTURE_VI_FEEDBACK);



    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) {

    aw_dev->adev = (struct audio_device*)adev;

    if (enable) {

        aw882xx_start_feedback(aw_dev->adev, devices);

    } else {

        aw882xx_stop_feedback(aw_dev->adev, devices);

    }

    return 0;

}



static int amp_dev_close(hw_device_t* device) {

    aw_t* dev = (aw_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;

    }



    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;

    }



    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;

}



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 = "AW882XX audio amplifier HAL",

        .author = "The LineageOS Project",

        .methods = &hal_module_methods,

    },

};