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

Commit 509f0a7c authored by yixuanjiang's avatar yixuanjiang Committed by Yixuan Jiang
Browse files

Revert "hal: add support to separate headset and headphones mixer backend" 

This reverts commit 6c5e87cc.
Test: manual usb phone test
Bug: 114178494

Change-Id: I07c72aad45e7fc9f08876a71db58948721aa9519
parent 6c5e87cc

hal/audio_hw.c

+13 −23
Original line number Original line Diff line number Diff line
@@ -600,6 +600,7 @@ static bool is_a2dp_device(snd_device_t out_snd_device) 
int enable_audio_route(struct audio_device *adev,

int enable_audio_route(struct audio_device *adev,

                       struct audio_usecase *usecase)

                       struct audio_usecase *usecase)

{

{

    snd_device_t snd_device;

    char mixer_path[50];

    char mixer_path[50];





    if (usecase == NULL)

    if (usecase == NULL)
@@ -607,21 +608,15 @@ int enable_audio_route(struct audio_device *adev, 




    ALOGV("%s: enter: usecase(%d)", __func__, usecase->id);

    ALOGV("%s: enter: usecase(%d)", __func__, usecase->id);





    if (usecase->type == PCM_CAPTURE)

        snd_device = usecase->in_snd_device;

    else

        snd_device = usecase->out_snd_device;

    audio_extn_utils_send_app_type_cfg(adev, usecase);

    audio_extn_utils_send_app_type_cfg(adev, usecase);

    audio_extn_utils_send_audio_calibration(adev, usecase);

    audio_extn_utils_send_audio_calibration(adev, usecase);

    audio_extn_sound_trigger_update_stream_status(usecase, ST_EVENT_STREAM_BUSY);

    strcpy(mixer_path, use_case_table[usecase->id]);

    strcpy(mixer_path, use_case_table[usecase->id]);



    platform_add_backend_name(adev->platform, mixer_path, snd_device);

    if (usecase->type == VOICE_CALL) {

    audio_extn_sound_trigger_update_stream_status(usecase, ST_EVENT_STREAM_BUSY);

        platform_add_backend_name(adev->platform, mixer_path, usecase->in_snd_device);

        if (!strstr(mixer_path, " "))

            platform_add_backend_name(adev->platform, mixer_path, usecase->out_snd_device);

    } else if (usecase->type == PCM_CAPTURE) {

        platform_add_backend_name(adev->platform, mixer_path, usecase->in_snd_device);

    } else {

        platform_add_backend_name(adev->platform, mixer_path, usecase->out_snd_device);

    }



    ALOGD("%s: usecase(%d) apply and update mixer path: %s", __func__,  usecase->id, mixer_path);

    ALOGD("%s: usecase(%d) apply and update mixer path: %s", __func__,  usecase->id, mixer_path);

    audio_route_apply_and_update_path(adev->audio_route, mixer_path);

    audio_route_apply_and_update_path(adev->audio_route, mixer_path);
@@ -632,24 +627,19 @@ int enable_audio_route(struct audio_device *adev, 
int disable_audio_route(struct audio_device *adev,

int disable_audio_route(struct audio_device *adev,

                        struct audio_usecase *usecase)

                        struct audio_usecase *usecase)

{

{

    snd_device_t snd_device;

    char mixer_path[50];

    char mixer_path[50];





    if (usecase == NULL)

    if (usecase == NULL)

        return -EINVAL;

        return -EINVAL;





    ALOGV("%s: enter: usecase(%d)", __func__, usecase->id);

    ALOGV("%s: enter: usecase(%d)", __func__, usecase->id);

    if (usecase->type == PCM_CAPTURE)

        snd_device = usecase->in_snd_device;

    else

        snd_device = usecase->out_snd_device;

    strcpy(mixer_path, use_case_table[usecase->id]);

    strcpy(mixer_path, use_case_table[usecase->id]);



    platform_add_backend_name(adev->platform, mixer_path, snd_device);

    if (usecase->type == VOICE_CALL) {

        platform_add_backend_name(adev->platform, mixer_path, usecase->in_snd_device);

        if (!strstr(mixer_path, " "))

            platform_add_backend_name(adev->platform, mixer_path, usecase->out_snd_device);

    } else if (usecase->type == PCM_CAPTURE) {

        platform_add_backend_name(adev->platform, mixer_path, usecase->in_snd_device);

    } else {

        platform_add_backend_name(adev->platform, mixer_path, usecase->out_snd_device);

    }



    ALOGD("%s: usecase(%d) reset and update mixer path: %s", __func__, usecase->id, mixer_path);

    ALOGD("%s: usecase(%d) reset and update mixer path: %s", __func__, usecase->id, mixer_path);

    audio_route_reset_and_update_path(adev->audio_route, mixer_path);

    audio_route_reset_and_update_path(adev->audio_route, mixer_path);

    audio_extn_sound_trigger_update_stream_status(usecase, ST_EVENT_STREAM_FREE);

    audio_extn_sound_trigger_update_stream_status(usecase, ST_EVENT_STREAM_FREE);