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

Commit 9c4ba54b authored by Naresh Tanniru's avatar Naresh Tanniru Committed by Gerrit - the friendly Code Review server
Browse files

hal: Add support for LINE out device 

- Add support for AUDIO_DEVICE_OUT_LINE device.
  Treat it same as Wired Headphone device w.r.t.
  routing and acdb device.
  If the acdb or backend is different it can be
  updated using audio_platform_info.xml.

- Increase deep buffer period size to 40ms and
  with peroid count as 2

Change-Id: Ic0821a4f22f99d44e98c2bd48179edcaa2c9247e
parent c6774e44

hal/msm8916/platform.c

+24 −4
Original line number Diff line number Diff line
@@ -338,7 +338,9 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_SPEAKER_REVERSE] = "speaker-reverse",

    [SND_DEVICE_OUT_HEADPHONES] = "headphones",

    [SND_DEVICE_OUT_HEADPHONES_44_1] = "headphones-44.1",

    [SND_DEVICE_OUT_LINE] = "line",

    [SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES] = "speaker-and-headphones",

    [SND_DEVICE_OUT_SPEAKER_AND_LINE] = "speaker-and-line",

    [SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1] = "speaker-and-headphones-ext-1",

    [SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2] = "speaker-and-headphones-ext-2",

    [SND_DEVICE_OUT_VOICE_HANDSET] = "voice-handset",
@@ -346,6 +348,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_SPEAKER_WSA] = "wsa-voice-speaker",

    [SND_DEVICE_OUT_VOICE_SPEAKER_VBAT] = "vbat-voice-speaker",

    [SND_DEVICE_OUT_VOICE_HEADPHONES] = "voice-headphones",

    [SND_DEVICE_OUT_VOICE_LINE] = "voice-line",

    [SND_DEVICE_OUT_HDMI] = "hdmi",

    [SND_DEVICE_OUT_SPEAKER_AND_HDMI] = "speaker-and-hdmi",

    [SND_DEVICE_OUT_BT_SCO] = "bt-sco-headset",
@@ -445,12 +448,15 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_SPEAKER_WSA] = 135,

    [SND_DEVICE_OUT_SPEAKER_VBAT] = 135,

    [SND_DEVICE_OUT_SPEAKER_REVERSE] = 14,

    [SND_DEVICE_OUT_LINE] = 10,

    [SND_DEVICE_OUT_HEADPHONES] = 10,

    [SND_DEVICE_OUT_HEADPHONES_44_1] = 10,

    [SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES] = 10,

    [SND_DEVICE_OUT_SPEAKER_AND_LINE] = 10,

    [SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1] = 10,

    [SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2] = 10,

    [SND_DEVICE_OUT_VOICE_HANDSET] = 7,

    [SND_DEVICE_OUT_VOICE_LINE] = 10,

    [SND_DEVICE_OUT_VOICE_SPEAKER] = 14,

    [SND_DEVICE_OUT_VOICE_SPEAKER_WSA] = 135,

    [SND_DEVICE_OUT_VOICE_SPEAKER_VBAT] = 135,
@@ -558,7 +564,9 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_REVERSE)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_HEADPHONES_44_1)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_LINE)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_LINE)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HANDSET)},
@@ -566,6 +574,7 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_WSA)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_VBAT)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_LINE)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_HDMI)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HDMI)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_BT_SCO)},
@@ -2482,6 +2491,9 @@ snd_device_t platform_get_output_snd_device(void *platform, struct stream_out *o 
                snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2;

            else

                snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;

        } else if (devices == (AUDIO_DEVICE_OUT_LINE |

                               AUDIO_DEVICE_OUT_SPEAKER)) {

                snd_device = SND_DEVICE_OUT_SPEAKER_AND_LINE;

        } else if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADSET |

                               AUDIO_DEVICE_OUT_SPEAKER)) {

            if (audio_extn_get_anc_enabled())
@@ -2515,7 +2527,8 @@ snd_device_t platform_get_output_snd_device(void *platform, struct stream_out *o 
    if ((mode == AUDIO_MODE_IN_CALL) ||

        voice_extn_compress_voip_is_active(adev)) {

        if (devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||

            devices & AUDIO_DEVICE_OUT_WIRED_HEADSET) {

            devices & AUDIO_DEVICE_OUT_WIRED_HEADSET ||

            devices & AUDIO_DEVICE_OUT_LINE) {

            if ((adev->voice.tty_mode != TTY_MODE_OFF) &&

                !voice_extn_compress_voip_is_active(adev)) {

                switch (adev->voice.tty_mode) {
@@ -2532,6 +2545,8 @@ snd_device_t platform_get_output_snd_device(void *platform, struct stream_out *o 
                    ALOGE("%s: Invalid TTY mode (%#x)",

                          __func__, adev->voice.tty_mode);

                }

            } else if (devices & AUDIO_DEVICE_OUT_LINE) {

                snd_device = SND_DEVICE_OUT_VOICE_LINE;

            } else if (audio_extn_get_anc_enabled()) {

                if (audio_extn_should_use_fb_anc())

                    snd_device = SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET;
@@ -2598,6 +2613,8 @@ snd_device_t platform_get_output_snd_device(void *platform, struct stream_out *o 
#endif

                snd_device = SND_DEVICE_OUT_HEADPHONES;

        }

    } else if (devices & AUDIO_DEVICE_OUT_LINE) {

        snd_device = SND_DEVICE_OUT_LINE;

    } else if (devices & AUDIO_DEVICE_OUT_SPEAKER) {

#ifdef RECORD_PLAY_CONCURRENCY

        if (use_voip_out_devices) {
@@ -2690,7 +2707,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
        if ((adev->voice.tty_mode != TTY_MODE_OFF) &&

            !voice_extn_compress_voip_is_active(adev)) {

            if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||

                out_device & AUDIO_DEVICE_OUT_WIRED_HEADSET) {

                out_device & AUDIO_DEVICE_OUT_WIRED_HEADSET ||

                out_device & AUDIO_DEVICE_OUT_LINE) {

                switch (adev->voice.tty_mode) {

                case TTY_MODE_FULL:

                    snd_device = SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC;
@@ -2709,7 +2727,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
            }

        }

        if (out_device & AUDIO_DEVICE_OUT_EARPIECE ||

            out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE) {

            out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||

            out_device & AUDIO_DEVICE_OUT_LINE) {

            if (out_device & AUDIO_DEVICE_OUT_EARPIECE &&

                audio_extn_should_use_handset_anc(channel_count) &&

                my_data->fluence_type != FLUENCE_NONE) {
@@ -2947,7 +2966,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
                snd_device = SND_DEVICE_IN_SPEAKER_STEREO_DMIC;

            else

                snd_device = SND_DEVICE_IN_SPEAKER_MIC;

        } else if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE) {

        } else if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||

                       out_device & AUDIO_DEVICE_OUT_LINE) {

            snd_device = SND_DEVICE_IN_HANDSET_MIC;

        } else if (out_device & AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET) {

            if (adev->bt_wb_speech_enabled) {

hal/msm8916/platform.h

+7 −3
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ enum { 
 */

#define AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND \

    (AUDIO_DEVICE_OUT_EARPIECE | AUDIO_DEVICE_OUT_SPEAKER | \

     AUDIO_DEVICE_OUT_WIRED_HEADSET | AUDIO_DEVICE_OUT_WIRED_HEADPHONE)

     AUDIO_DEVICE_OUT_WIRED_HEADSET | AUDIO_DEVICE_OUT_WIRED_HEADPHONE|\

     AUDIO_DEVICE_OUT_LINE)



/*

 * Below are the input devices for which back end is same, SLIMBUS_0_TX.
@@ -73,9 +74,11 @@ enum { 
    SND_DEVICE_OUT_SPEAKER_REVERSE,

    SND_DEVICE_OUT_SPEAKER_WSA,

    SND_DEVICE_OUT_SPEAKER_VBAT,

    SND_DEVICE_OUT_LINE,

    SND_DEVICE_OUT_HEADPHONES,

    SND_DEVICE_OUT_HEADPHONES_44_1,

    SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES,

    SND_DEVICE_OUT_SPEAKER_AND_LINE,

    SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1,

    SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2,

    SND_DEVICE_OUT_VOICE_HANDSET,
@@ -83,6 +86,7 @@ enum { 
    SND_DEVICE_OUT_VOICE_SPEAKER_WSA,

    SND_DEVICE_OUT_VOICE_SPEAKER_VBAT,

    SND_DEVICE_OUT_VOICE_HEADPHONES,

    SND_DEVICE_OUT_VOICE_LINE,

    SND_DEVICE_OUT_HDMI,

    SND_DEVICE_OUT_SPEAKER_AND_HDMI,

    SND_DEVICE_OUT_BT_SCO,
@@ -209,8 +213,8 @@ enum { 
 * We should take care of returning proper size when AudioFlinger queries for

 * the buffer size of an input/output stream

 */

#define DEEP_BUFFER_OUTPUT_PERIOD_SIZE 960

#define DEEP_BUFFER_OUTPUT_PERIOD_COUNT 5

#define DEEP_BUFFER_OUTPUT_PERIOD_SIZE 1920

#define DEEP_BUFFER_OUTPUT_PERIOD_COUNT 2

#define LOW_LATENCY_OUTPUT_PERIOD_SIZE 240

#define LOW_LATENCY_OUTPUT_PERIOD_COUNT 2