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

Commit 90fb9610 authored by rago's avatar rago
Browse files

Adding UNPROCESSED to the available audio_sources 

bug: 25564291
Change-Id: I1dba35fb7c64e06726c7af6bae33ce4831e64d16
parent 3239eaf6

hal/msm8974/platform.c

+20 −5
Original line number Diff line number Diff line
@@ -251,6 +251,9 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE] = "voice-rec-dmic-ef-fluence",

    [SND_DEVICE_IN_VOICE_REC_HEADSET_MIC] = "headset-mic",



    [SND_DEVICE_IN_UNPROCESSED_MIC] = "voice-rec-mic",

    [SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC] = "headset-mic",



    [SND_DEVICE_IN_VOICE_RX] = "voice-rx",



    [SND_DEVICE_IN_THREE_MIC] = "three-mic",
@@ -311,7 +314,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS] = 117,

    [SND_DEVICE_IN_SPEAKER_DMIC_STEREO] = 35,



    [SND_DEVICE_IN_HEADSET_MIC] = 8,

    [SND_DEVICE_IN_HEADSET_MIC] = ACDB_ID_HEADSET_MIC_AEC,

    [SND_DEVICE_IN_HEADSET_MIC_AEC] = ACDB_ID_HEADSET_MIC_AEC,



    [SND_DEVICE_IN_HDMI_MIC] = 4,
@@ -326,16 +329,19 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_VOICE_SPEAKER_MIC] = 11,

    [SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP] = 11,

    [SND_DEVICE_IN_VOICE_SPEAKER_DMIC] = 43,

    [SND_DEVICE_IN_VOICE_HEADSET_MIC] = 8,

    [SND_DEVICE_IN_VOICE_HEADSET_MIC] = ACDB_ID_HEADSET_MIC_AEC,

    [SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC] = 16,

    [SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC] = 36,

    [SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC] = 16,



    [SND_DEVICE_IN_VOICE_REC_MIC] = 62,

    [SND_DEVICE_IN_VOICE_REC_MIC] = ACDB_ID_VOICE_REC_MIC,

    [SND_DEVICE_IN_VOICE_REC_MIC_NS] = 113,

    [SND_DEVICE_IN_VOICE_REC_DMIC_STEREO] = 35,

    [SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE] = 43,

    [SND_DEVICE_IN_VOICE_REC_HEADSET_MIC] = 8,

    [SND_DEVICE_IN_VOICE_REC_HEADSET_MIC] = ACDB_ID_HEADSET_MIC_AEC,



    [SND_DEVICE_IN_UNPROCESSED_MIC] = ACDB_ID_VOICE_REC_MIC,

    [SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC] = ACDB_ID_HEADSET_MIC_AEC,



    [SND_DEVICE_IN_VOICE_RX] = 44,
@@ -430,6 +436,9 @@ static const struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_REC_HEADSET_MIC)},



    {TO_NAME_INDEX(SND_DEVICE_IN_UNPROCESSED_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC)},



    {TO_NAME_INDEX(SND_DEVICE_IN_THREE_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_QUAD_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_CAPTURE_VI_FEEDBACK)},
@@ -1968,6 +1977,12 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
        } else if (in_device & AUDIO_DEVICE_IN_WIRED_HEADSET) {

            snd_device = SND_DEVICE_IN_VOICE_REC_HEADSET_MIC;

        }

    } else if (source == AUDIO_SOURCE_UNPROCESSED) {

        if (in_device & AUDIO_DEVICE_IN_BUILTIN_MIC) {

            snd_device = SND_DEVICE_IN_UNPROCESSED_MIC;

        } else if (in_device & AUDIO_DEVICE_IN_WIRED_HEADSET) {

            snd_device = SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC;

        }

    } else if (source == AUDIO_SOURCE_VOICE_COMMUNICATION ||

               mode == AUDIO_MODE_IN_COMMUNICATION) {

        if (out_device & (AUDIO_DEVICE_OUT_SPEAKER | AUDIO_DEVICE_OUT_SPEAKER_SAFE))

hal/msm8974/platform.h

+4 −0
Original line number Diff line number Diff line
@@ -132,6 +132,9 @@ enum { 
    SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE,

    SND_DEVICE_IN_VOICE_REC_HEADSET_MIC,



    SND_DEVICE_IN_UNPROCESSED_MIC,

    SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC,



    SND_DEVICE_IN_VOICE_RX,



    SND_DEVICE_IN_THREE_MIC,
@@ -158,6 +161,7 @@ enum { 
#define ACDB_ID_VOICE_HANDSET_TMUS 88

#define ACDB_ID_VOICE_DMIC_EF_TMUS 89

#define ACDB_ID_HEADSET_MIC_AEC 8

#define ACDB_ID_VOICE_REC_MIC 62



#define MAX_VOL_INDEX 5

#define MIN_VOL_INDEX 0