diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-16 07:24:15 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-16 07:24:15 +0000 |
| commit | 7f5daf9ac55c7f8f712f029984ef3df9e27edf79 (patch) | |
| tree | 75a8b084e0af2c0ee2fbcf313fb4aedf8c21cc1a | |
| parent | 1dabc0156cf4ca116a46986d77265d70bc018494 (diff) | |
| parent | 2ec1f93aece05532504235d94e71583561991ec5 (diff) | |
| download | device_generic_car-7f5daf9ac55c7f8f712f029984ef3df9e27edf79.tar.gz device_generic_car-7f5daf9ac55c7f8f712f029984ef3df9e27edf79.tar.bz2 device_generic_car-7f5daf9ac55c7f8f712f029984ef3df9e27edf79.zip | |
Snap for 4784261 from 2ec1f93aece05532504235d94e71583561991ec5 to pi-release
Change-Id: I22b589af4155b00709fbc947ba19df823a6d98c2
| -rw-r--r-- | common/car.mk | 3 | ||||
| -rw-r--r-- | emulator/audio/audio_policy_configuration.xml | 20 | ||||
| -rw-r--r-- | emulator/audio/driver/audio_hw.c | 4 |
3 files changed, 12 insertions, 15 deletions
diff --git a/common/car.mk b/common/car.mk index 51f6ca5..27860b3 100644 --- a/common/car.mk +++ b/common/car.mk @@ -14,9 +14,6 @@ # limitations under the License. # -# TODO Remove this when AAE is fully treble ready -PRODUCT_FULL_TREBLE_OVERRIDE := false - # Auto modules PRODUCT_PACKAGES += \ android.hardware.automotive.vehicle@2.0-service 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; |