diff options
| author | Jason Hsu <jasonchhsu@google.com> | 2020-06-05 13:17:41 +0800 |
|---|---|---|
| committer | Cyan_Hsieh <cyanhsieh@google.com> | 2020-06-10 15:15:56 +0800 |
| commit | 445011aaadd0d32117d6d24bd9374629c38de562 (patch) | |
| tree | 5afb7a040af72ad9e1a3d0b0aa22e7c64a6933e8 /audio | |
| parent | ac3ffc70ecd1bbab21d7b36b8d092e5a88b1a448 (diff) | |
| download | redfin-445011aaadd0d32117d6d24bd9374629c38de562.tar.gz | |
audio: update audio table
1. For mixer_paths_noextcodec_snd.xml,
a. Change gain setup from 0dB(value 23) to 22dB(value 52) of path name "voice-rec-mic".
b. Add strings for gain visibility of path name "handset-stereo-dmic-ef".
c. Change gain setup from 13dB(value 40) to 22dB(value 52) and add strings for gain visibility of path name "voice-rec-dmic-ef".
d. Change gain setup from 0dB(value 23) to 22dB(value 52) of path name "three-mic".
e. Change gain setup from 0dB(value 23) to 5dB(value 30) and add strings for gain visibility of path name "unprocessed-mic".
f. Change gain setup from 13dB(value 40) to 5dB(value 30) and add strings for gain visibility of path name "unprocessed-stereo-mic".
g. Change gain setup from 0dB(value 23) to 5dB(value 30) and add strings for gain visibility of path name "unprocessed-three-mic".
2. For audio_platform_info_noextcodec_snd.xml,
a. Apply acdb id_144 for SND_DEVICE_IN_VOICE_REC_DMIC_STEREO.
b. Update "microphone_characteristics" and "input_snd_device_mic_mapping" to fit R3 configurations.
Bug: 145244105
Test: Verified by H/W
Signed-off-by: Jason Hsu <jasonchhsu@google.com>
Change-Id: I5cc6c87c0a4cf100e993fce1906a253966bc564c
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio_platform_info_noextcodec_snd.xml | 310 | ||||
| -rw-r--r-- | audio/mixer_paths_noextcodec_snd.xml | 17 |
2 files changed, 32 insertions, 295 deletions
diff --git a/audio/audio_platform_info_noextcodec_snd.xml b/audio/audio_platform_info_noextcodec_snd.xml index d2ccc45..5c396d4 100644 --- a/audio/audio_platform_info_noextcodec_snd.xml +++ b/audio/audio_platform_info_noextcodec_snd.xml @@ -81,6 +81,7 @@ <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" acdb_id="147"/> <device name="SND_DEVICE_IN_USB_HEADSET_MIC" acdb_id="4"/> <device name="SND_DEVICE_IN_VOICE_TTY_VCO_SPEAKER_MIC" acdb_id="19"/> + <device name="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO" acdb_id="144"/> </acdb_ids> <external_specific_dev> <!-- condor --> @@ -328,22 +329,17 @@ group="0" index_in_the_group="0" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="93" frequencies="100.00 106.00 112.00 118.00 125.00 132.00 140.00 150.00 160.00 170.00 180.00 190.00 200.00 212.00 224.00 236.00 250.00 265.00 280.00 300.00 315.00 335.00 355.00 375.00 400.00 425.00 450.00 475.00 500.00 530.00 560.00 600.00 630.00 670.00 710.00 750.00 800.00 850.00 900.00 950.00 1000.00 1060.00 1120.00 1180.00 1250.00 1320.00 1400.00 1500.00 1600.00 1700.00 1800.00 1900.00 2000.00 2120.00 2240.00 2360.00 2500.00 2650.00 2800.00 3000.00 3150.00 3350.00 3550.00 3750.00 4000.00 4250.00 4500.00 4750.00 5000.00 5300.00 5600.00 6000.00 6300.00 6700.00 7100.00 7500.00 8000.00 8500.00 9000.00 9500.00 10000.00 10600.00 11200.00 11800.00 12500.00 13200.00 14000.00 15000.00 16000.00 17000.00 18000.00 19000.00 20000.00" responses="-0.78 -0.71 -0.64 -0.60 -0.55 -0.50 -0.47 -0.42 -0.39 -0.36 -0.34 -0.33 -0.32 -0.29 -0.28 -0.28 -0.27 -0.25 -0.25 -0.24 -0.23 -0.23 -0.22 -0.22 -0.19 -0.17 -0.15 -0.15 -0.14 -0.14 -0.12 -0.11 -0.10 -0.10 -0.08 -0.07 -0.07 -0.04 -0.03 -0.01 0.00 0.04 0.06 0.07 0.08 0.13 0.09 0.14 0.19 0.23 0.28 0.29 0.31 0.37 0.88 0.86 0.77 0.78 0.84 0.86 1.05 1.12 1.18 1.25 1.43 1.66 1.83 2.02 2.23 2.59 2.84 3.35 4.01 6.82 6.62 6.42 7.30 8.23 7.54 12.68 13.76 18.69 19.68 20.90 23.70 25.10 21.65 16.18 18.84 25.44 23.48 23.22 24.89" - sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 0.0 1.0" geometric_location="0.0269 0.0058 0.0079" /> + sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 -1.0 0.0" geometric_location="0.0269 0.0058 0.0079" /> <microphone valid_mask="31" device_id="builtin_mic_2" type="AUDIO_DEVICE_IN_BACK_MIC" address="back" location="AUDIO_MICROPHONE_LOCATION_MAINBODY" group="0" index_in_the_group="1" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="92" frequencies="106.00 112.00 118.00 125.00 132.00 140.00 150.00 160.00 170.00 180.00 190.00 200.00 212.00 224.00 236.00 250.00 265.00 280.00 300.00 315.00 335.00 355.00 375.00 400.00 425.00 450.00 475.00 500.00 530.00 560.00 600.00 630.00 670.00 710.00 750.00 800.00 850.00 900.00 950.00 1000.00 1060.00 1120.00 1180.00 1250.00 1320.00 1400.00 1500.00 1600.00 1700.00 1800.00 1900.00 2000.00 2120.00 2240.00 2360.00 2500.00 2650.00 2800.00 3000.00 3150.00 3350.00 3550.00 3750.00 4000.00 4250.00 4500.00 4750.00 5000.00 5300.00 5600.00 6000.00 6300.00 6700.00 7100.00 7500.00 8000.00 8500.00 9000.00 9500.00 10000.00 10600.00 11200.00 11800.00 12500.00 13200.00 14000.00 15000.00 16000.00 17000.00 18000.00 19000.00 20000.00" responses="-0.75 -0.74 -0.69 -0.65 -0.62 -0.61 -0.56 -0.53 -0.50 -0.47 -0.43 -0.40 -0.37 -0.36 -0.33 -0.30 -0.28 -0.25 -0.24 -0.24 -0.24 -0.25 -0.24 -0.12 -0.10 -0.08 -0.09 -0.07 -0.07 -0.06 -0.06 -0.06 -0.05 -0.04 -0.05 -0.04 -0.01 0.02 0.02 0.00 0.02 0.03 0.07 0.10 0.10 0.13 0.01 0.01 0.10 0.11 0.19 0.24 0.38 0.46 0.26 0.27 0.43 0.76 0.75 1.09 1.09 0.94 1.06 1.21 1.47 1.45 1.36 2.07 2.85 2.90 3.85 4.65 5.84 5.46 6.15 7.50 8.30 10.62 12.70 16.65 20.95 25.41 26.32 20.20 16.60 11.24 7.85 7.62 20.19 7.32 2.87 5.18" - sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 1.0 0.0" geometric_location="0.0546 0.1456 0.00415" /> - <microphone valid_mask="31" device_id="builtin_mic_3" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="" location="AUDIO_MICROPHONE_LOCATION_MAINBODY" + sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 0.0 -1.0" geometric_location="0.0546 0.1456 0.00415" /> + <microphone valid_mask="31" device_id="builtin_mic_3" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="bottom" location="AUDIO_MICROPHONE_LOCATION_MAINBODY" group="0" index_in_the_group="2" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="92" frequencies="100.00 106.00 112.00 118.00 125.00 132.00 140.00 150.00 160.00 170.00 180.00 190.00 200.00 212.00 224.00 236.00 250.00 265.00 280.00 300.00 315.00 335.00 355.00 375.00 400.00 425.00 450.00 475.00 500.00 530.00 560.00 600.00 630.00 670.00 710.00 750.00 800.00 850.00 900.00 950.00 1000.00 1060.00 1120.00 1180.00 1250.00 1320.00 1400.00 1500.00 1600.00 1700.00 1800.00 1900.00 2000.00 2120.00 2240.00 2360.00 2500.00 2650.00 2800.00 3000.00 3150.00 3350.00 3550.00 3750.00 4000.00 4250.00 4500.00 4750.00 5000.00 5300.00 5600.00 6000.00 6300.00 6700.00 7100.00 7500.00 8000.00 8500.00 9000.00 9500.00 10000.00 10600.00 11200.00 11800.00 12500.00 13200.00 14000.00 15000.00 16000.00 17000.00 18000.00 19000.00" responses="-9.24 -9.31 -9.39 -9.45 -9.46 -9.47 -9.50 -9.52 -9.51 -9.52 -9.51 -9.50 -9.49 -9.47 -9.48 -9.49 -9.48 -9.50 -9.51 -9.53 -9.55 -9.59 -9.63 -9.67 -9.58 -9.57 -9.65 -9.68 -9.71 -9.75 -9.79 -9.84 -9.87 -9.87 -9.90 -9.90 -9.91 -9.97 -10.01 -10.05 -9.85 -9.93 -9.94 -9.98 -10.04 -10.12 -10.28 -10.25 -10.01 -9.86 -9.81 -9.82 -9.61 -9.46 -8.27 -8.42 -8.98 -8.99 -8.82 -9.21 -8.92 -8.97 -9.30 -9.44 -9.52 -9.28 -9.09 -8.81 -7.02 -5.72 -5.30 -7.26 -8.39 -12.28 -8.23 -6.99 -5.52 -4.87 -3.82 -6.09 0.00 -2.15 -0.26 1.48 5.22 10.92 6.41 9.55 12.96 3.35 22.00 19.75" - sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 0.0 1.0" geometric_location="0.0274 0.14065 0.0079" /> - <microphone valid_mask="31" device_id="builtin_mic_4" type="AUDIO_DEVICE_IN_BACK_MIC" address="" location="AUDIO_MICROPHONE_LOCATION_MAINBODY" - group="0" index_in_the_group="3" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="92" - frequencies="106.00 112.00 118.00 125.00 132.00 140.00 150.00 160.00 170.00 180.00 190.00 200.00 212.00 224.00 236.00 250.00 265.00 280.00 300.00 315.00 335.00 355.00 375.00 400.00 425.00 450.00 475.00 500.00 530.00 560.00 600.00 630.00 670.00 710.00 750.00 800.00 850.00 900.00 950.00 1000.00 1060.00 1120.00 1180.00 1250.00 1320.00 1400.00 1500.00 1600.00 1700.00 1800.00 1900.00 2000.00 2120.00 2240.00 2360.00 2500.00 2650.00 2800.00 3000.00 3150.00 3350.00 3550.00 3750.00 4000.00 4250.00 4500.00 4750.00 5000.00 5300.00 5600.00 6000.00 6300.00 6700.00 7100.00 7500.00 8000.00 8500.00 9000.00 9500.00 10000.00 10600.00 11200.00 11800.00 12500.00 13200.00 14000.00 15000.00 16000.00 17000.00 18000.00 19000.00 20000.00" - responses="-0.75 -0.74 -0.69 -0.65 -0.62 -0.61 -0.56 -0.53 -0.50 -0.47 -0.43 -0.40 -0.37 -0.36 -0.33 -0.30 -0.28 -0.25 -0.24 -0.24 -0.24 -0.25 -0.24 -0.12 -0.10 -0.08 -0.09 -0.07 -0.07 -0.06 -0.06 -0.06 -0.05 -0.04 -0.05 -0.04 -0.01 0.02 0.02 0.00 0.02 0.03 0.07 0.10 0.10 0.13 0.01 0.01 0.10 0.11 0.19 0.24 0.38 0.46 0.26 0.27 0.43 0.76 0.75 1.09 1.09 0.94 1.06 1.21 1.47 1.45 1.36 2.07 2.85 2.90 3.85 4.65 5.84 5.46 6.15 7.50 8.30 10.62 12.70 16.65 20.95 25.41 26.32 20.20 16.60 11.24 7.85 7.62 20.19 7.32 2.87 5.18" - sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 1.0 0.0" geometric_location="0.0546 0.1456 0.00415" /> + sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 1.0 0.0" geometric_location="0.0274 0.14065 0.0079" /> </microphone_characteristics> <snd_devices> <input_snd_device> @@ -352,90 +348,6 @@ <mic_info mic_device_id="builtin_mic_1" channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_MIC_AEC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_MIC_NS"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_MIC_AEC_NS"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_DMIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_DMIC_AEC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_DMIC_NS"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_MIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_MIC_AEC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_MIC_NS"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_DMIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_DMIC_AEC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_DMIC_NS"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_SPEAKER_MIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_CAMCORDER_MIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> <snd_dev in_snd_device="SND_DEVICE_IN_CAMCORDER_LANDSCAPE"> <mic_info mic_device_id="builtin_mic_1" channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> @@ -484,211 +396,41 @@ <mic_info mic_device_id="builtin_mic_3" channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_DMIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_SPEAKER_DMIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_SPEAKER_TMIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_SPEAKER_QMIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_4" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_MIC"> <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/> </snd_dev> <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_MIC_NS"> <mic_info mic_device_id="builtin_mic_1" channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_AANC_HANDSET_MIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_QUAD_MIC"> + <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_MIC_AEC"> <mic_info mic_device_id="builtin_mic_1" channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_4" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_STEREO_DMIC"> + <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_MIC_AEC_NS"> <mic_info mic_device_id="builtin_mic_1" channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_STEREO_DMIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_SPEAKER_DMIC_BROADSIDE"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_DMIC_BROADSIDE"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_DMIC_AEC_BROADSIDE"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_DMIC_NS_BROADSIDE"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_BROADSIDE"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_FLUENCE_DMIC_AANC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_QMIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_QMIC_AEC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_QMIC_NS"> + <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO"> <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/> </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS"> + <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_DMIC_STEREO"> <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> </snd_dev> <snd_dev in_snd_device="SND_DEVICE_IN_THREE_MIC"> <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_TMIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_TMIC_AEC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_TMIC_NS"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_REC_TMIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> + channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> </snd_dev> <snd_dev in_snd_device="SND_DEVICE_IN_UNPROCESSED_MIC"> <mic_info mic_device_id="builtin_mic_1" @@ -697,7 +439,7 @@ <snd_dev in_snd_device="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC"> <mic_info mic_device_id="builtin_mic_1" channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> - <mic_info mic_device_id="builtin_mic_2" + <mic_info mic_device_id="builtin_mic_3" channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/> </snd_dev> <snd_dev in_snd_device="SND_DEVICE_IN_UNPROCESSED_THREE_MIC"> @@ -708,22 +450,6 @@ <mic_info mic_device_id="builtin_mic_3" channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/> </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_UNPROCESSED_QUAD_MIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/> - </snd_dev> - <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_GENERIC_QMIC"> - <mic_info mic_device_id="builtin_mic_1" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_2" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - <mic_info mic_device_id="builtin_mic_3" - channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/> - </snd_dev> </input_snd_device_mic_mapping> </input_snd_device> </snd_devices> diff --git a/audio/mixer_paths_noextcodec_snd.xml b/audio/mixer_paths_noextcodec_snd.xml index 541a093..52de63f 100644 --- a/audio/mixer_paths_noextcodec_snd.xml +++ b/audio/mixer_paths_noextcodec_snd.xml @@ -2220,6 +2220,7 @@ <path name="voice-rec-mic"> <path name="handset-mic" /> + <ctl name="ADC1 Capture Volume" id="0" value="52"/> </path> <path name="camcorder-mic"> @@ -2339,6 +2340,8 @@ <path name="handset-stereo-dmic-ef"> <path name="handset-dmic-endfire" /> + <ctl name="ADC1 Capture Volume" id="0" value="23"/> + <ctl name="ADC2 Capture Volume" id="1" value="23"/> </path> <path name="speaker-stereo-dmic-ef"> @@ -2363,6 +2366,8 @@ <path name="voice-rec-dmic-ef"> <path name="dmic-endfire" /> + <ctl name="ADC1 Capture Volume" id="0" value="52"/> + <ctl name="ADC2 Capture Volume" id="1" value="52"/> </path> <path name="voice-rec-dmic-ef-fluence"> @@ -2412,9 +2417,9 @@ <!-- Tri MIC devices --> <path name="three-mic"> - <ctl name="ADC1 Capture Volume" id="0" value="23"/> - <ctl name="ADC2 Capture Volume" id="0" value="23"/> - <ctl name="ADC2 Capture Volume" id="1" value="23"/> + <ctl name="ADC1 Capture Volume" id="0" value="52"/> + <ctl name="ADC2 Capture Volume" id="0" value="52"/> + <ctl name="ADC2 Capture Volume" id="1" value="52"/> <ctl name="PRI TDM TX Channel Offset" id="0" value="12"/> <ctl name="PRI TDM TX Channel Offset" id="1" value="8" /> <ctl name="PRI TDM TX Channel Offset" id="2" value="0" /> @@ -2523,14 +2528,20 @@ <path name="unprocessed-mic"> <path name="unprocessed-handset-mic" /> + <ctl name="ADC1 Capture Volume" id="0" value="30"/> </path> <path name="unprocessed-stereo-mic"> <path name="voice-rec-dmic-ef" /> + <ctl name="ADC1 Capture Volume" id="0" value="30"/> + <ctl name="ADC2 Capture Volume" id="1" value="30"/> </path> <path name="unprocessed-three-mic"> <path name="three-mic" /> + <ctl name="ADC1 Capture Volume" id="0" value="30"/> + <ctl name="ADC2 Capture Volume" id="0" value="30"/> + <ctl name="ADC2 Capture Volume" id="1" value="30"/> </path> <path name="unprocessed-quad-mic"> |