diff options
| author | Hongwei Wang <hwwang@google.com> | 2018-05-15 21:13:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-15 21:13:38 +0000 |
| commit | b664d76690e68999498ec0f66f8edce79178eb1e (patch) | |
| tree | 2047cb123f5cdd2fd7afbcf70f32cbd36a955fd6 /emulator | |
| parent | da9dc8837ef43c89910bf0ca1f4544889a98f391 (diff) | |
| parent | 542de46b3cbad0e94db596f71ce0da8be4b7a27c (diff) | |
| download | device_generic_car-b664d76690e68999498ec0f66f8edce79178eb1e.tar.gz device_generic_car-b664d76690e68999498ec0f66f8edce79178eb1e.tar.bz2 device_generic_car-b664d76690e68999498ec0f66f8edce79178eb1e.zip | |
Merge "Adjusts the gain control in audio_policy_configuration" into pi-dev
Diffstat (limited to 'emulator')
| -rw-r--r-- | emulator/audio/audio_policy_configuration.xml | 20 | ||||
| -rw-r--r-- | emulator/audio/driver/audio_hw.c | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/emulator/audio/audio_policy_configuration.xml b/emulator/audio/audio_policy_configuration.xml index eade9ab..eb1d453 100644 --- a/emulator/audio/audio_policy_configuration.xml +++ b/emulator/audio/audio_policy_configuration.xml @@ -142,7 +142,7 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> <gains> <gain name="" mode="AUDIO_GAIN_MODE_JOINT" - minValueMB="-8400" maxValueMB="4000" defaultValueMB="0" stepValueMB="100"/> + minValueMB="-3200" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/> </gains> </devicePort> <devicePort tagName="bus1_navigation_out" role="sink" type="AUDIO_DEVICE_OUT_BUS" @@ -151,7 +151,7 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> <gains> <gain name="" mode="AUDIO_GAIN_MODE_JOINT" - minValueMB="-8400" maxValueMB="4000" defaultValueMB="0" stepValueMB="100"/> + minValueMB="-3200" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/> </gains> </devicePort> <devicePort tagName="bus2_voice_command_out" role="sink" type="AUDIO_DEVICE_OUT_BUS" @@ -160,7 +160,7 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> <gains> <gain name="" mode="AUDIO_GAIN_MODE_JOINT" - minValueMB="-8400" maxValueMB="4000" defaultValueMB="0" stepValueMB="100"/> + minValueMB="-3200" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/> </gains> </devicePort> <devicePort tagName="bus3_call_ring_out" role="sink" type="AUDIO_DEVICE_OUT_BUS" @@ -169,7 +169,7 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> <gains> <gain name="" mode="AUDIO_GAIN_MODE_JOINT" - minValueMB="-8400" maxValueMB="4000" defaultValueMB="0" stepValueMB="100"/> + minValueMB="-3200" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/> </gains> </devicePort> <devicePort tagName="bus4_call_out" role="sink" type="AUDIO_DEVICE_OUT_BUS" @@ -178,7 +178,7 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> <gains> <gain name="" mode="AUDIO_GAIN_MODE_JOINT" - minValueMB="-8400" maxValueMB="4000" defaultValueMB="0" stepValueMB="100"/> + minValueMB="-3200" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/> </gains> </devicePort> <devicePort tagName="bus5_alarm_out" role="sink" type="AUDIO_DEVICE_OUT_BUS" @@ -187,7 +187,7 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> <gains> <gain name="" mode="AUDIO_GAIN_MODE_JOINT" - minValueMB="-8400" maxValueMB="4000" defaultValueMB="0" stepValueMB="100"/> + minValueMB="-3200" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/> </gains> </devicePort> <devicePort tagName="bus6_notification_out" role="sink" type="AUDIO_DEVICE_OUT_BUS" @@ -196,7 +196,7 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> <gains> <gain name="" mode="AUDIO_GAIN_MODE_JOINT" - minValueMB="-8400" maxValueMB="4000" defaultValueMB="0" stepValueMB="100"/> + minValueMB="-3200" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/> </gains> </devicePort> <devicePort tagName="bus7_system_sound_out" role="sink" type="AUDIO_DEVICE_OUT_BUS" @@ -205,7 +205,7 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> <gains> <gain name="" mode="AUDIO_GAIN_MODE_JOINT" - minValueMB="-8400" maxValueMB="4000" defaultValueMB="0" stepValueMB="100"/> + minValueMB="-3200" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/> </gains> </devicePort> <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source"> @@ -224,7 +224,7 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/> <gains> <gain name="" mode="AUDIO_GAIN_MODE_JOINT" - minValueMB="-8400" maxValueMB="4000" defaultValueMB="0" stepValueMB="100"/> + minValueMB="-3200" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/> </gains> </devicePort> <!-- Test input device ports for audio patch --> @@ -234,7 +234,7 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/> <gains> <gain name="" mode="AUDIO_GAIN_MODE_JOINT" - minValueMB="-8400" maxValueMB="4000" defaultValueMB="0" stepValueMB="100"/> + minValueMB="-3200" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/> </gains> </devicePort> </devicePorts> diff --git a/emulator/audio/driver/audio_hw.c b/emulator/audio/driver/audio_hw.c index 75aa2c2..c2eff7e 100644 --- a/emulator/audio/driver/audio_hw.c +++ b/emulator/audio/driver/audio_hw.c @@ -987,8 +987,8 @@ static int adev_open_output_stream(struct audio_hw_device *dev, hashmapPut(adev->out_bus_stream_map, out->bus_address, out); /* TODO: read struct audio_gain from audio_policy_configuration */ out->gain_stage = (struct audio_gain) { - .min_value = -8400, - .max_value = 4000, + .min_value = -3200, + .max_value = 600, .step_value = 100, }; out->amplitude_ratio = 1.0; |