Commit graph

51 commits

Author SHA1 Message Date
Joey Poomarin Phloyphisut
96b58c1c6f audio_usb: Updating mixer_paths.xml to use V2 command to send config to AoC to support USB behind HUB.
This V2 command is from this patch:
https://partner-android-review.googlesource.com/c/kernel/private/google-modules/aoc/+/1962494

Bug: 181296179
Test: Local build
Change-Id: Ia95886ed22519f4da70e2a4880f7fb0eb9900660
2021-07-19 11:33:51 +00:00
Joey Poomarin Phloyphisut
895e3d3808 audio_usb: Add unsupported pcm format for USB accessory on Raviole.
This patch need ag/15270810 to work.

Test: N/A
Bug: 193477495
Change-Id: Ied9317fed60f1fae5a0de76ed12aec723c20a0c2
2021-07-19 07:33:28 +00:00
millerliang
eff4e0db3d audio: adjust the latency for USB Headphone
Adjust the latency for OUT_USB_HEADSET_BE_CFG

Bug: 174992590
Test: Test av sync for video playback
Change-Id: Idc1dedbbc21290106d417905832810b1ebd1c576
2021-07-14 21:27:00 +08:00
Carter Hsu
f8a04fb6d9 audio: add BT path back to the haptic output
Bug: 192910606
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: Iccfb65d568a640c01177d81f8c96d2103b9fda49
2021-07-13 04:11:46 +00:00
millerliang
d2db8a5541 audio: apply RAW path for raw playback
Apply the entry point of raw path which writes data through
pcm mmap from user space to DRAM ring buffer.

Bug: 190775545
Test: OboeTester
Change-Id: I3f61126f323fcebc0a2b53c06d564b9e9e64f823
2021-07-12 13:22:54 +00:00
Joey Poomarin Phloyphisut
6def5fe520 USB Audio: Add USB HiFi routing
Let USB HiFi BE as a standalone bind/src command to AoC.
And fix that USB HiFi Rx no audio after the other touch
sound's UC and BE is closed.

On top of the change of pa/1959717
(pa/Ib82ff06986ebe97d472f4518aa136f32da30da66)

Test: Local test
Bug: 191222376
Change-Id: I1017aab232bd2e929dc4caa9939f0613ba937f86
2021-07-12 10:10:40 +00:00
millerliang
0d481528c0 audio: adjust the latency for output and input
Change the period size to 20 for audio record.
Otherwise it will apply fast capture.
Fast capture timestamps are not supported yet.

Bug: 190453606
Bug: 189793417
Test: Test av sync for camera recording
Test: Test av sync for video playback
Change-Id: Ic7225979a411f6fdef1e5869df7f816bd49003b1
2021-06-25 13:44:27 +00:00
Robert Lee
12a5e8f467 audio: update audio table
<Change List>
For audio_platform_configuration.xml to both O6 & R4,
1. Add below devices for input_backend_cfg_mic_mapping to fix b/188696633.
     - <backend_cfg in_cfg="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG">
     - <backend_cfg in_cfg="IN_CAMCORDER_PORTRAIT_BE_CFG">
     - <backend_cfg in_cfg="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG">
     - <backend_cfg in_cfg="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG">
     - <backend_cfg in_cfg="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG">
     - <backend_cfg in_cfg="IN_VOICE_RECOGN_MIC_BE_CFG">
     - <backend_cfg in_cfg="IN_UNPROCESSED_MIC_BE_CFG">
     - <backend_cfg in_cfg="IN_UNPROCESSED_DUAL_MIC_BE_CFG">
     - <backend_cfg in_cfg="IN_UNPROCESSED_TRIPLE_MIC_BE_CFG">

<Validation Results>
All the regression are positive, which is validated based on SD1A.210614.001 build.
1. Fix freeze issue when running Diagnostic Tool for microphone test.
2. Built-in mic capturing with expected gain setup and active mic numbers in different mic source(mic/VR/unprocessed/camcorder).
3. Built-in speaker playout with expected gain setup in speaker & speaker-safe mode.
4. Both uplink & downlink for telephony works in HA/HH mode.

Bug: 174448901
Test: Builds pass and verified by hardware
Change-Id: Ifb14911eb25ef2b0f42d29b609ae6f9b74ddaa44
Signed-off-by: Robert Lee <lerobert@google.com>
2021-06-25 07:41:20 +00:00
Carter Hsu
12f1ede6b1 audio: add echo reference input
Bug: 188005303
Test: capture the echo reference
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I28c6ceb2e3f719bbd7d24e4301704742933042a4
2021-06-22 12:13:19 +00:00
Carter Hsu
fb03700852 audio: add echo reference input
Bug: 188005303
Test: capture the echo reference
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: Ie7e69b7c56801395e03280dd2415842b7f22f898
2021-06-22 12:13:19 +00:00
YB Chiu
8ae9e16235 FBF:mixer_table: mic soft gain config for O6/R4/W3/Slider
Add mic1 ~ mic4 soft gain configuration

    <path name="mic1-sw-gain">
        <ctl name="MIC Record Soft Gain (dB)" />
    </path>
            :
            :
    <path name="mic4-sw-gain">
        <ctl name="MIC Record Soft Gain (dB)" />
    </path>

Bug: 190822301

Test: build pass

Change-Id: Ia5f35fff6cea22d6dfafa8c76e50d3e16cacbbcf
2021-06-22 08:29:42 +00:00
Rios Kao
e537b06099 audio: update Raven/Oriole mixer path to V2.2
<Change List>
For mixer_paths.xml to both O6 & R4,
1. Add default value for "MIC Record Soft Gain (dB)" control  to accommodate with b/189498328.
2. Update below path name to move compensation gain from "MIC HW Gain At High Power Mode (cB)" to "MIC Record Soft Gain (dB)" to fix recording concurrency issue(b/189294476).
     - <path name="handset-mic">
     - <path name="speaker-mic">
     - <path name="camcorder-mic">
     - <path name="voice-recog-mic">
     - <path name="unprocessed-mic">
     - <path name="unprocessed-dual-mic">
     - <path name="unprocessed-triple-mic">

<Validation Results>
All the regression are positive, which is validated based on SD1A.210614.001 build.
1. Built-in mic capturing with expected gain setup and active mic numbers in different mic source(mic/VR/unprocessed/camcorder).
2. Built-in speaker playout with expected gain setup in speaker & speaker-safe mode.
3. Both uplink & downlink for telephony works in HA/HH mode.

Bug: 174448901
Test: basic record pass
Change-Id: I3f7759e6998f419a3d7d87b032d8088f5bc7dac0
2021-06-17 05:12:46 +00:00
David Li
00eb5c2a60 audio: add dynamics_processing to audio_effects.xml
Bug: 187144478
Test: run cts --include-filter "CtsMediaTestCases android.media.cts.DynamicsProcessingTest"
Change-Id: Id3ca6f6ef76a00a94d72150bcf3c4873478626ea
2021-06-16 01:56:43 +00:00
Carter Hsu
f9d90fe79b audio: update audio capture tuning
1. Support more camcorder tuning with different channels
2. Update the latest params on WNR, SUR, Linear gain, MBDRC module.

Bug: 181869495
Bug: 186721091
Bug: 174448901

Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I969b9bbb6a3fd74206dfc0bf385d9ebc1fddf194
2021-06-13 02:00:07 +00:00
Carter Hsu
221629670f audio: fix xml tag name
Bug: 188606492
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I6fbc2e17bc11c19b224e472b868627ee9d110369
2021-06-10 06:22:22 +00:00
David Li
8132cc2f27 audio: upgrade audio.usb.default from v1 to v2
Bug: 187912470
Test: make -j128
Test: deep buffer and compress offload via speaker, USB headset, BT
earphone
Test: phone call via handset
Test: hotword detection

Change-Id: I80ec553797ff7955de0464b98046f879424d0fc5
2021-06-08 06:14:43 +00:00
Joey Poomarin
6facc05f47 USB Audio: Enable HIFI on the audio HAL part on Raviole.
Kernel Change: pa/1887451

Test: N/A
Bug: 182996456
Change-Id: Ia62f8a0b8b0c57270a3c8ed82cb64a79fbcbfe79
2021-06-04 10:52:21 +00:00
Yu-Bin Chiu
18a9190963 [MFG_API] [audio] USB headset loopback functions don't work on ROM SD1A.210602.005
Need to add a new control "USB Config To AoC" in mixer table

Bug: 190002718

Test: verify it with a new mixer table, and it works on O6
Change-Id: Ibcb43d50d0185d8b5249aa2a5620c69871b97de5
2021-06-03 08:42:02 +00:00
Joey Poomarin Phloyphisut
3375ea9045 USB Audio: Enable HIFI Playback on the audio HAL part on Raviole.
Test: Test: local build test. If use highspeed usb + capture. AOC crash. otherwise, everything is normal
Bug: 182996456
Change-Id: I48958acf8dfc77fa90096fc72cd6912c460e1db2
2021-05-24 08:53:27 +00:00
Vince Leung
0a6e699f51 Revert "Remove audio-coupled-haptics support"
This reverts commit fd3f417352.

Reason for revert: functional implementation of audio coupled haptics feature working again

Bug: 178431048
Test: manually verify audio-coupled-haptics is working for Pixel
ringtones on P21 devices

Change-Id: Ibda582e6b4f95dcf9bd5497dbc3580eb1569f9a2
2021-05-17 18:42:34 +00:00
Vince Leung
bbc1857804 audio: route haptic EP to haptic backend
Bug: 178431048
Test: manually verify audio-coupled-haptics is working for Pixel
ringtones on P21 devices

Change-Id: I54a7dbe713e03af031036534f2dba388903ea81e
2021-05-17 18:42:34 +00:00
Carter Hsu
4101e82133 audio: separate the spatial audio and WNR block
Bug: 186801118
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I38be2bfd58e864e7f17bc58109d5b4a77df5704b
2021-05-12 01:09:43 +00:00
millerliang
cdeb65a6c2 audio: remove bt path for raw and mmap playback
In AOC, ULL support requires the sink to be ULL
Speaker, Analog HP and USB are ULL Sinks,
Modem and BT are LL

Bug: 165737390
Test: OboeTester --> TEST OUTPUT
Change-Id: I23da02a52586e2f5d017142b5947dd082cdc2c62
2021-05-10 22:11:38 +08:00
Carter Hsu
c35126b2ef audio: update Raven/Oriole mixer path to V2.0
<Change List>
For mixer_paths.xml to both O6 & R4,
1. Update path name "voice-speaker" to choose VMON of bottom speaker AMP as EC reference under telephony HH mode.
2. Add the "boost peak current limit" control of cirrus speaker amps for initial value(3.50A) and below paths name.
    - "speaker" for stereo speaker playback, top amp with 1.70A, bottom amp with 1.90A
    - "speaker-safe" for mono speaker playback(ringtone, alarm, notification), bottom amp with 3.50A
    - "voice-handset" for telephony HA mode, top amp with 3.50A
    - "voice-speaker" for telephone HH mode, bottom amp with 3.50A
Bug: 174448901
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I8bb847fbf1fc8632edf7a4f27b22184a4dd828d4
2021-05-10 04:03:07 +00:00
millerliang
9c06c83aa3 audio: add to support low-latency-record(fast intput)
AudioRecord not support PCM_FLOAT on FAST path yet.(b/77913243)
Use 16-bit format for low-latency-record.

Bug: 175673727
Test: OboeTester
Change-Id: I450d161cd1b236717ad01287b95f56a284443040
2021-05-07 16:58:11 +08:00
millerliang
80c7d2ef11 audio: add to support mmap record
Add to support mmap-record

Bug: 175673727
Test: OboeTester
Change-Id: Ib3dc9b5df969e972b6a1155a216eeb4e5e353b3f
Signed-off-by: millerliang <millerliang@google.com>
2021-05-06 13:59:32 +00:00
David Li
a10a9d85f2 audio: replace audio_pre_process with offload_effect and remove audio_pre_process
Move AEC and NS to the liboffloadeffect

Bug: 187153996
Test: make -j128
Test: run cts --include-filter "CtsMediaTestCases android.media.cts.AudioPreProcessingTest"
Change-Id: Ic4b7260b483b776ca917dc3694b7d66ba7eefde7
2021-05-06 02:28:43 +00:00
Vince Leung
fd3f417352 Remove audio-coupled-haptics support
Temporarily remove haptics support so that Telecom fallback mechanism of
default vibration will play whenever audio coupled haptics is not
supported.

Bug: 186720581
Test: manually verify on raviole that default vibration plays for
ringtone

Change-Id: I77e4a4a7ff19e6665434d9318271d20cd64e6c1d
Signed-off-by: Vince Leung <leungv@google.com>
2021-05-06 01:11:50 +00:00
Carter Hsu
7c81054244 audio: add bt-mic for audio capture
Bug: 185209822
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I4d37148ed75e57e8077b6a752b190ee87d289a9a
2021-05-03 17:17:33 +00:00
Robert Lee
4460dac76b audio: bypass aoc post processing on speaker for factory audio test
For Cirrus amp, ASP means Audio Serial Port.
For AoC, ASP means Audio Signal Processing.

Bug: 184238845
Test: manual test factory test command
Change-Id: I8d62535056ef680e14ccc708c8f722a3dfab12ab
Signed-off-by: Robert Lee <lerobert@google.com>
2021-04-29 09:18:46 +00:00
Roger Fang
29c600ea29 device: google: load audio_ext module to support audio suez
Bug: 171854614
Test: manually test passed
Signed-off-by: Roger Fang <rogerfang@google.com>
Change-Id: Ib3cb34d045d80ba69f930dab0d9277c72208ae97
2021-04-28 03:10:20 +00:00
juyuchen
47166c6085 audio: update audio platform table
Increase period size to avoid using Fastmixer in the deep buffer
playback.

Bug: 185096280
Test: manual audio tests
Signed-off-by: juyuchen <juyuchen@google.com>
Change-Id: I8ce12f151eaa9b711e1dacaf12e2f70c0555bf30
2021-04-27 11:15:12 +00:00
HW Lee
eab909573b audio: remove unsupported TinyALSA controls
Bug: 185443616
Test: build pass
Signed-off-by: HW Lee <hwlee@google.com>
Change-Id: I84abb4a1d59ff8344d7fc308be7f82c21b591b00
2021-04-22 01:31:14 +00:00
Jasmine Cha
2a6d256369 audio: switch Audio HAL to V7
- update audio_policy_configuration tables by those instructions.
./hardware/interfaces/audio/7.0/config/update_audio_policy_config.sh device/google/raviole/audio/oriole/config/audio_policy_configuration.xml 6.0
./hardware/interfaces/audio/7.0/config/update_audio_policy_config.sh device/google/raviole/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml 6.0
./hardware/interfaces/audio/7.0/config/update_audio_policy_config.sh device/google/raviole/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml 6.0

./hardware/interfaces/audio/7.0/config/update_audio_policy_config.sh device/google/raviole/audio/raven/config/audio_policy_configuration.xml 6.0
./hardware/interfaces/audio/7.0/config/update_audio_policy_config.sh device/google/raviole/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml 6.0
./hardware/interfaces/audio/7.0/config/update_audio_policy_config.sh device/google/raviole/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml 6.0

./hardware/interfaces/audio/7.0/config/update_audio_policy_config.sh device/google/raviole/audio/whitefin/config/audio_policy_configuration.xml 6.0
./hardware/interfaces/audio/7.0/config/update_audio_policy_config.sh device/google/raviole/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml 6.0
./hardware/interfaces/audio/7.0/config/update_audio_policy_config.sh device/google/raviole/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml 6.0

./hardware/interfaces/audio/7.0/config/update_audio_policy_config.sh device/google/raviole/audio/slider/config/audio_policy_configuration.xml 6.0
./hardware/interfaces/audio/7.0/config/update_audio_policy_config.sh device/google/raviole/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml 6.0
./hardware/interfaces/audio/7.0/config/update_audio_policy_config.sh device/google/raviole/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml 6.0

bug:180878031
Test: atest VtsHalAudioV6_0TargetTest
      atest VtsHalAudioV7_0TargetTest
      atest VtsHalAudioEffectV6_0TargetTest
      atest VtsHalAudioEffectV7_0TargetTest
      atest VtsHalAudioPolicyV1_0TargetTest
      manual audio test - playback/record/voice call

Signed-off-by: Jasmine Cha <chajasmine@google.com>
Change-Id: I003875ed041feeedbb7d16f517063cec164382be
2021-04-14 16:35:01 +08:00
HW Lee
5faf342d2f audio: add initial values of controls
Bug: 184696656
Test: build pass
Signed-off-by: HW Lee <hwlee@google.com>
Change-Id: Iad3d8b9e2bcf75efbdc2397b12e866b995fdb848
2021-04-13 04:46:35 +00:00
David Li
e9fbea2a99 audio: initialize mixer_control Incall Sink Mute and Incall Mic Mute
Bug: 177914228
Bug: 165750425
Bug: 180983997
Bug: 180984364
Test: call screen mode 2, mute microphone in voice call
Change-Id: I7535e6d2c9f739a0e2c7f867f4ca54430d587da0
2021-04-13 01:43:38 +00:00
Carter Hsu
3755b08b67 audio: add VoIP RX/TX
Bug: 165755752
Test: Build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I1393c55447b50dbff8ad590e48b9046a7f4ecc7d
2021-03-30 00:44:05 +00:00
justinweng
cd5aaf7fdf add AAC to A2DP offload support format
Bug: 168584138
Test: builds pass

Signed-off-by: justinweng <justinweng@google.com>
Change-Id: I59768fc12d759ceb2ab9569c57417a9b0f6c7026
2021-03-25 10:57:48 +00:00
millerliang
094c57ce4a audio: add to support raw and mmap
Add to support raw-playback and mmap-playback

Bug: 165737390
Test: OboeTester->Test Output
Signed-off-by: millerliang <millerliang@google.com>
Change-Id: I2e9f530bd5d4c6d1f8d6bc3504d2fd0472631fcb
2021-03-25 15:16:36 +08:00
David Li
3a300b35c9 audio: add "LVM Enable" and "Decoder Reference Enable"
Turn on "LVM Enable" when the offload playback path is applied.

Bug: 180984363
Bug: 165719427
Test: make -j128
Test: test LVM effects and visualizer on offload playback on oriole
Change-Id: I5e64575ce39fe0e8d9f54913ccab9cc47da8763e
2021-03-25 03:04:18 +00:00
yixuanjiang
3d84c1a5a9 audio: gain modify on handset-mic
Request From HW Darren and only modify on o6/r4

Test: verify by HW Darren
Bug: 182761985
Signed-off-by: yixuanjiang <yixuanjiang@google.com>
Change-Id: I5461ed54078dce1a532b345a923530fa00ddd97f
2021-03-19 17:33:15 +08:00
YB Chiu
bff2bffb51 [MFG_API] [audio] update mixer table for usb headset gain
the usb headset gain control change to below
playback : tinymix -D 1 "Headset Playback Volume"
capture : tinymix -D 1 "Headset Capture Volume"

Bug: 182438057

Test: build pass
Change-Id: Ie66d0dfdb4975fae772be6a5d6524ad2358c7627
2021-03-18 03:06:59 +00:00
David Li
8a702b11f5 audio: add mixer_path for call screen mode 4 and hearing aid
Test: call screen mode 2 and 4, normal voice call
Bug: 165750425
Bug: 177914228
Bug: 181924779
Bug: 165753519
Change-Id: I2373dab47e54bda8b8bb9d7d4fbcde42c2f921d0
2021-03-18 02:20:28 +00:00
HW Lee
b51e60eca7 Merge "audio: factory: remove temporal solution of gain control" into sc-dev 2021-03-16 10:06:56 +00:00
yixuanjiang
b765c3f825 audio: Add PDM mic enabling flexibility
fix the multi-channel recording creates fail issue

Bug: 181849225
Bug: 174448901
Bug: 176208349
Test: verify by HW Oneal
Signed-off-by: yixuanjiang <yixuanjiang@google.com>
Change-Id: I728ebb2633257583a245c61b559fba4ec726efd4
2021-03-12 13:59:19 +08:00
HW Lee
1fb8cfcc6d audio: factory: remove temporal solution of gain control
Bug: 182429145
Test: build pass
Signed-off-by: HW Lee <hwlee@google.com>
Change-Id: I0e3bb560c83824c71dcfe7232df43a0f563c513f
2021-03-11 09:06:55 +00:00
David Li
0a7ce9cef8 audio: add incall playback and capture to policy config and mixer path
Bug: 165750425
Test: make -j128, test call screen feature on oriole
Change-Id: I9d002359d119bc65932442d27aa5a13cc9193be0
2021-03-11 16:10:40 +08:00
Carter Hsu
4f61648333 Merge "audio: enable AAC codec for compress-offload" into sc-dev 2021-03-09 07:31:17 +00:00
rioskao
00ba8df5a4 support music_break model for whi product
Bug: 176410687
Test: test with STTAP
Change-Id: I2d109ce2e5e078173256c84b52a1e4f176fb5502
2021-03-08 10:44:34 +08:00
Carter Hsu
f8beeb1f06 audio: enable AAC codec for compress-offload
AAC_LC, AAC_HE_V1, AAC_HW_V2

Bug: 170647768
Test: AAC playback by compress-offload
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I84af6c9e8435de98ddbc4c6e8995989665c4d1ed
2021-03-08 09:42:28 +08:00