summaryrefslogtreecommitdiff
path: root/emulator
AgeCommit message (Collapse)Author
2020-07-22Added missing audio libraries to car emulatorOscar Azucena
Added audio effects, audio service, and default submix libraries. Due to a recent change in golfish the libraries were removed from car emulator targets. Bug: 161753755 Bug: 161846952 Test: make -j60,run emulator and play MZ audio. Change-Id: I3ee44d739230bc0249d40acfdd784da9c23e0a38 (cherry picked from commit dcb9c6cc213cc7884a05047e309bd50ac6a341a8)
2020-06-17Enabled car audio in car emulatorOscar Azucena
Goldfish had disabled car audio with their latest changes. Re-enabled car audio by enabling EMULATOR_VENDOR_NO_SOUND flag. Also added missing car audio HAL information. Bug: 159165632 Test: Run emulator and verify MZ audio works as expected. Change-Id: I4edfc928ce2c1bc89de35719622136f47b6a143d
2020-06-15Merge "Added simulated input devices to HW sound emulator." into rvc-devOscar Azucena
2020-06-12Added simulated input devices to HW sound emulator.Oscar Azucena
Added simulated audio input devices to car audio configuration. This devices can be used for any audio zone in particular but are mostly set to target zone 0 and zone 1. Also added osillator struct to keep track of phase and current phase increment (e.g ~frequency) to keep track of current phase changes in simulated input device. Test: m -j, run emulator Bug: 158122733 Change-Id: Iecdcd695975b71ce4d49c0770bd9ea02f9703cd3
2020-06-03Removed configs for car audio display API.Oscar Azucena
Removed car audio configurations for car audio display API. Bug: 148223185 Test: m -j, run target Merged-In: I377225baf29f6529f232d1df5cd39daf4d40bdc4 Change-Id: I377225baf29f6529f232d1df5cd39daf4d40bdc4 (cherry picked from commit c2209df91cb07cd7a12da182de40446fb56b805d)
2020-05-29Add a FLAG to include ClusterDisplay at the emulatorYuncheol Heo
Bug: 155790826 Test: Check if gcar_hl_emu_x86 has a Cluster display. Change-Id: Ib6f1715e82a5e499a23e6f15510f9910aa97602f
2020-05-28Fixed audio service crash due to missing library.Oscar Azucena
Audio policy service was crashing due to missing sound trigger library. This library is not used but due to recent changes the audio HAL is reset and thus causes the audio service to crash. Bug: 157097833 Test: make installclean & make -j60 Test: run gcar emulator and verify the audio server does not crashes. Change-Id: I2ffa0ab53a1d58b17439880cb5a39248567c446d
2020-04-08Changed car emulator target to use _audio_zone_Oscar Azucena
Changed car emulator audio to use _audio_zone_ to identify the audio zone for each zone device. Bug: 148292262 Test: Lunch gcar_hl_md_emu_x86 Test: make -j60 Test: emulator Change-Id: I51c0ae2d24b1343dd2568f88bc19b635f5275379
2020-03-02Updated car emulator audio configurationOscar Azucena
Updated car emulator target car_audio_configuration.xml file to version 2. The new version requires audioZoneId be defined in all zones except for primary zone. Also Added occupantZoneId to primary zone. Other targets, like multi-display, should be updated independently as the number of occupants will vary in those files. Bug: 148292262 Test: lunch gcar_hl_md_emu_x86-userdebug, m -j Test: emulator -skin 1280x720 -verbose -show-kernel -selinux permissive -no-snapstorage -no-cache -prop ro.aae.simulateMultiZoneAudio=true -prop aae.playZoneId=2 Test: atest CarAudioZonesHelperTest Test: atest CarAudioZoneTest Test: atest CarOccupantZoneServiceTest Change-Id: If04c01a9b803ed41ee3fbb0e6c85f090c14f7c7e Merged-In: If04c01a9b803ed41ee3fbb0e6c85f090c14f7c7e (cherry picked from commit 2ebc17563fc31002386f7fcb3c918559d43ce9b8)
2020-01-13Merge "Removed uneeded settings."TreeHugger Robot
2019-12-20Reapply "Add car audio emu support to aosp_car_* targets"Mark Grady
This reverts commit 52cf1a678cf3a6b232810e3f205b093784eaae93. Bug:130232630 Test: Compile emulator and verify functionality Change-Id: I3241eb07c89b25081cdea089884bf8b612e52522
2019-11-21Removed uneeded settings.Oscar Azucena
Removing uneeded file to get the mapping for output devices to display. Bug: 144959912 Test: Ran emulator target Change-Id: Ib5e3611036cef3babe02fd4adc28079b2b7c16ab
2019-10-16Revert "Add car audio emu support to aosp_car_* targets"Mark Grady
This reverts commit 65f83fa730fcdbd80eaa1646800f958df96f48eb. Reason for revert: depends upon deprecated car_emulator_hal.mk Change-Id: I584c7a77d46b29d7402570206dd004d41c05ccc8
2019-10-15Add car audio emu support to aosp_car_* targetsMark Grady
Bug: 130232630 Test: Manually tested on both x86 flavors. Can't test ARM. Change-Id: I9149d42bfd7137f7967d0925af31e11ff2247852 (cherry picked from commit e9cb384330cc8f89aceea4f559be0b7a1c77db7d)
2019-09-10Added logic to switch zones at right speakerOscar Azucena
Added aae.playZoneId to allow different zones to play at right speaker when using the car emulator. Bug: 134524865 Test: Ran kitchen sink emulator Change-Id: Ie05718feff62e84d7bd3e40f250e5de0a7bf585c
2019-06-05Added screen information to emulator audio am: a06ecd19c4 am: 8bfb6ef1e7Oscar Azucena
am: 607ad79c11 Change-Id: Ia37bf2584053a9e14f9c315911ea41f484238ea2
2019-06-03Added screen information to emulator audioandroid10-devOscar Azucena
Added display info to emulator audio_polic_configuration.xml. This enables multizone audio support for display in emulator. Bug: 134104943 Test: Tested using emulator and kitchensink app. Change-Id: I89f219ab4ec9be0892f86078c6d6d7815c4e144f
2019-05-29Combine manifest and car_emulator_manifest.xml. Cleanup car.mk. am: ↵Nicholas Sauer
c2757e9bbb am: 68606421c4 am: 5023228f93 Change-Id: I7fb18de45cadbc7e6d1806176be28b384349e102
2019-05-28Combine manifest and car_emulator_manifest.xml. Cleanup car.mk.Nicholas Sauer
bug: 133807382 Test: lunch gcar && m && emulator lunch aosp && m && emulator Change-Id: I7ca8100519733c3df0c1d55f4e86001f692e14e2
2019-05-15Merge "Update broadcastradio HAL instance names" into qt-dev am: f7bd8eeac3 ↵Tomasz Wasilczyk
am: c9ebd3ebb7 am: bbb11e11f7 Change-Id: I43706009f13b5e98ec1f098160d27efa44ed0ef8
2019-05-15Merge "Update broadcastradio HAL instance names" into qt-devTreeHugger Robot
2019-05-15Adding BT mock for car emulator am: 2365e13575Hayden Gomes
am: cec0de07ab Change-Id: I2b587c17b228ef866dcbd7f991077cf3a06847db
2019-05-14Adding BT mock for car emulatorHayden Gomes
Adding BT support to car emulator using services.sim to mock Bluetooth Bug: 132627197 Test: Built and ran emulator locally to verify Change-Id: Ibaf29461f27d3e535550d6f4d800038bb6846a8e
2019-05-14Update broadcastradio HAL instance namesTomasz Wasilczyk
Bug: 129781689 Bug: 131864200 Bug: 129290324 Test: flash, boot, grep logcat for 'broadcastradio' Change-Id: Ibab6ea2155ea73f80a29f6e851137dfafa50d27f
2019-05-13Merge "Remove USE_XML_AUDIO_POLICY_CONF build flag"TreeHugger Robot
2019-05-13Remove USE_XML_AUDIO_POLICY_CONF build flagMikhail Naganov
This flag is no more used by the build files and should be removed. Bug: 132435217 Test: make Change-Id: I55f2533b3d20ed0c8221d8ecdec744c2e71ca46a
2019-05-13Remove incorrectly formatted display tagsHayden Gomes
The car_audio_configuration format has be updated to expect port=# rather than name=string for display tags. As they are not currently used on the emulator, we are simply removing them to enable things to boot again. Test: make -j and ran emulator to confirm it lauches Bug: 132626851 Change-Id: Ia569776aae98d91188ccf5f6cb528755713f92f8
2019-04-18Merge "Separates zone audio to different channels in car emulator" into qt-devHongwei Wang
2019-04-17Separates zone audio to different channels in car emulatorHongwei Wang
- rear seat buses (with "rear" in its address) uses right channel - left channel otherwise This behavior is enabled only if ro.aae.simulateMultiZoneAudio property is turned on. To switch the behavior back and forth during runtime, one has to restart the audioserver as well as car service after changing the value via `adb shell setprop <key> <value>`. The most convenient way would be to enable this flag at boot time as following ``` emulator -prop ro.aae.simulateMultiZoneAudio=true ``` Bug: 120299880 Test: manually on gcar_emu_x86-userdebug emulator Change-Id: I61e542ca621f922dfafe7c5979bd4d13ab2fc57a
2019-04-08Adds AUDIO_SOURCE_ECHO_REFERENCE in car emulatorHongwei Wang
Sample usage ``` final AudioAttributes attributes = new AudioAttributes.Builder() .setUsage(AudioAttributes.USAGE_MEDIA) .setInternalCapturePreset(MediaRecorder.AudioSource.ECHO_REFERENCE) .build(); final AudioRecord record = new AudioRecord.Builder() .setAudioAttributes(attributes) .build(); ``` Bug: 129882605 Test: dumpsys media.audio_policy Change-Id: I72a850aa787599a8f7579cf77899e9b8034f10f0
2019-01-28Enables broadcast radio in Car emulatorHongwei Wang
Also exposes the FM tuner as an audio input device in emulator. Bug: 118763832 Test: Launch Radio app (with startAudioSource) in emulator Change-Id: I75732a68382f8453bc858da8de2de32417c63d98
2019-01-08Adds multi-zone audio support in emulatorHongwei Wang
Test: adb shell dumpsys car_service | grep -A72 CarAudioService Bug: 120299880 Bug: 121273516 Change-Id: I1c95b9c95a2c16b55cce90733e54a47076d6198e
2018-07-09Overrides audio policy configurations in vendor/etcHongwei Wang
The system default policy configurations are placed in vendor/etc. Copy our overrides to the same location. Bumps also the broadcast radio HAL to 2.0 Bug: 111203470 Test: adb shell dumpsys activity service com.android.car/.CarService Change-Id: Id5ef7b3c2a4dbeed70b7a38aa5b6236cff4006d4
2018-06-13Adds broadcast radio 2.0 default HAL to car emulatorHongwei Wang
Also, uses broadcast radio to better demonstrate audio patch as an end-to-end case. We can further surface pseudo broadcast radio audio stream. Bug: 110166790 Test: launch radio app in gcar_emu_x86-userdebug Change-Id: I3871e7ef5408a7ae15ea35c80176dc0d00dae200
2018-05-30Demonstrates master mute implementation in car emulatorpie-devHongwei Wang
Bug: 80474559 Test: adb shell input keyevent 164 Change-Id: I75710257050d97ee1e6d637ee6fef0efecb9e39f
2018-05-15Merge "Adjusts the gain control in audio_policy_configuration" into pi-devHongwei Wang
2018-05-14Fixes crash from in_read_worker on car emulatorHongwei Wang
Bug: 79696410 Test: audio recording on car emulator Change-Id: I51b4ebef2dd2c074b360307a99bc498eee9eb1ea
2018-05-11Adjusts the gain control in audio_policy_configurationHongwei Wang
from (-84dB, 40dB) to (-32dB, 6dB), 38 steps in total Bug: 79586064 Test: Play music on emulator and adjust volume Change-Id: Iaba45c481961478645ef090987faa1d1e537f203
2018-05-11Simulates audio mixerHongwei Wang
Bug: 79496296 Test: Play music + navigation in KitchenSink, gcar_emu_x86-userdebug Change-Id: I335183e2428e655d1cd81141d49326b457669383
2018-05-10Simulates hardware gain control in audio driverHongwei Wang
Change log - audio_vbuffer in its own source and header files - a pcm is shared via ext_pcm by multiple audio streams Known issue - Audio is distorted if multiple audio streams try to play simultaneously. This is due to lack of proper audio mixing and will be fixed in a future CL Bug: 79496296 Test: manually Change-Id: I14392e13ae49131a044efdda97ea23946287ad97
2018-05-07Adds back default Built-in Mic for emulatorHongwei Wang
Bug: 78604377 Test: manually Change-Id: I61cddb081ab38c1c97cb2ee6646cb2768b48e626
2018-04-03Adds audio patch testHongwei Wang
audio_hw.c is formatted via clang-format and more debug information for audio patch is added Bug: 77147937 Test: releaseAudioPatch(createAudioPatch(String, int, int)) Change-Id: I5cb02557cc5df31a3d33337905601630c5bd525e
2018-03-01Makes car emulator audio driver AOSPHongwei Wang
- Grouped all emulator related work in emulator folder - Moved also the default hal implementation here - Deprecated the Android.mk in favor of Android.bp Bug: 68940567 Test: lunch gcar_emu_x86-userdebug && m -j Change-Id: I284d8b60301fcb9c7c65aed3c8a08e7e6c0ac0f2