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

Commit b29bb128 authored by andysu's avatar andysu Committed by android-build-merger
Browse files

hal: prevent device switch when speaker swap channel 

am: 5b30b062

Change-Id: Ie5dfd7acdc0d701e7c3d5395301fde1998f11cf6
parents ac96da5e 5b30b062

hal/msm8916/platform.c

+7 −1
Original line number Diff line number Diff line
@@ -1701,7 +1701,13 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi 
    } else if (devices & AUDIO_DEVICE_OUT_LINE) {

        snd_device = SND_DEVICE_OUT_LINE;

    } else if (devices & AUDIO_DEVICE_OUT_SPEAKER) {

        if (my_data->speaker_lr_swap)

        /*

         * Perform device switch only if acdb tuning is different between SPEAKER & SPEAKER_REVERSE,

         * Or there will be a small pause while performing device switch.

         */

        if (my_data->speaker_lr_swap &&

            (acdb_device_table[SND_DEVICE_OUT_SPEAKER] !=

            acdb_device_table[SND_DEVICE_OUT_SPEAKER_REVERSE]))

            snd_device = SND_DEVICE_OUT_SPEAKER_REVERSE;

        else

            snd_device = SND_DEVICE_OUT_SPEAKER;

hal/msm8960/platform.c

+7 −1
Original line number Diff line number Diff line
@@ -697,7 +697,13 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi 
        devices & AUDIO_DEVICE_OUT_WIRED_HEADSET) {

        snd_device = SND_DEVICE_OUT_HEADPHONES;

    } else if (devices & AUDIO_DEVICE_OUT_SPEAKER) {

        if (my_data->speaker_lr_swap)

        /*

         * Perform device switch only if acdb tuning is different between SPEAKER & SPEAKER_REVERSE,

         * Or there will be a small pause while performing device switch.

         */

        if (my_data->speaker_lr_swap &&

            (acdb_device_table[SND_DEVICE_OUT_SPEAKER] !=

            acdb_device_table[SND_DEVICE_OUT_SPEAKER_REVERSE]))

            snd_device = SND_DEVICE_OUT_SPEAKER_REVERSE;

        else

            snd_device = SND_DEVICE_OUT_SPEAKER;

hal/msm8974/platform.c

+7 −1
Original line number Diff line number Diff line
@@ -2549,7 +2549,13 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi 
    } else if (devices & AUDIO_DEVICE_OUT_SPEAKER_SAFE) {

        snd_device = SND_DEVICE_OUT_SPEAKER_SAFE;

    } else if (devices & AUDIO_DEVICE_OUT_SPEAKER) {

        if (my_data->speaker_lr_swap)

        /*

         * Perform device switch only if acdb tuning is different between SPEAKER & SPEAKER_REVERSE,

         * Or there will be a small pause while performing device switch.

         */

        if (my_data->speaker_lr_swap &&

            (acdb_device_table[SND_DEVICE_OUT_SPEAKER] !=

            acdb_device_table[SND_DEVICE_OUT_SPEAKER_REVERSE]))

            snd_device = SND_DEVICE_OUT_SPEAKER_REVERSE;

        else

            snd_device = SND_DEVICE_OUT_SPEAKER;