Commit graph

72 commits

Author SHA1 Message Date
Carter Hsu
44df45931e audio: update O6/R4 Aaram volume curve am: e5484251ec am: df94b156aa
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16005300

Change-Id: I7a2fc4371aa12bca5575d34a10e51a94e67fb1ba
2021-10-08 08:18:34 +00:00
Eric Laurent
7808c8d398 audio config: fix minimum alarm volume am: d9f59c1496 am: 652fb4f952
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/15958180

Change-Id: Id49d04cc974a9a7eff0cd0659c20277eefe3ca4f
2021-10-08 08:18:34 +00:00
Carter Hsu
8852d7bcee audio: update O6/R4 Aaram volume curve
O6
Change:
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
        <point>0,-4800</point>
R4
Change:
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
        <point>0,-5200</point>

Bug: 201069348
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: Ia5f82e06bc272d93172892692c7987993786b754
2021-10-08 12:02:04 +08:00
Eric Laurent
0800e891ec audio config: fix minimum alarm volume
The ALARM volume curve on SPEAKER device must have a lowest
point with abscisse 0 instead of 1 to prevent the stream from
being muted when lowest UI index is selected.

Bug: 201069348
Test: set alarm volume to min and play alarm
Change-Id: I29dda66002562e9ce889bd4f8b0154c2837f7be5
2021-10-08 12:01:03 +08:00
millerliang
f503184b6d audio: changet the period size of VoIP Record am: 47a8acc5f1 am: 87179e112b am: 24dc47bdc3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/15824293

Change-Id: Ia3b42d2dba65e27ea9c3842a2ac537e44f5ac4e3
2021-09-24 07:48:17 +00:00
millerliang
823c84320c audio: changet the period size of VoIP Record am: 47a8acc5f1 am: 87179e112b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/15824293

Change-Id: Ic17bc449305c97ad73b14975365c81e27b069e94
2021-09-24 07:35:43 +00:00
millerliang
5fb9498c64 audio: changet the period size of VoIP Record am: 47a8acc5f1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/15824293

Change-Id: I9051aef768a94eb34b32770dafe38ed25046007d
2021-09-24 07:14:38 +00:00
millerliang
a8c236c35c audio: changet the period size of VoIP Record
Change the period size of VoIP Record to 20ms.
Otherwise it will apply fast capture.
Fast capture timestamps are not supported yet.

Bug: 196912510
Test: Build pass
Change-Id: I6434a7596880712efa7cbfa03b3480efb5e2c2aa
2021-09-24 10:41:15 +08:00
Xinhui Zhou
d11462ae1f audio: deep buffer to floating point pcm data [DO NOT MERGE] am: ee3bc4db89 am: cb8dbcaaf2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/15799241

Change-Id: Ic41c4806edc3524f6c3d96d9144f7e062d8daa1f
2021-09-21 22:25:18 +00:00
Xinhui Zhou
923b3af81f audio: deep buffer to floating point pcm data [DO NOT MERGE] am: ee3bc4db89
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/15799241

Change-Id: I4ca8af2b8270665bd447859b010ad33ddbcd692e
2021-09-21 22:10:44 +00:00
Xinhui Zhou
411cd28a78 audio: deep buffer to floating point pcm data [DO NOT MERGE]
Bug: 199157246
Test: build pass
Signed-off-by: Xinhui Zhou <zxinhui@google.com>
Change-Id: I331d55403daadda3bb6699b3dfff0e759f782b95
2021-09-21 21:58:32 +00:00
Roger Fang
be2bde46ba audio_usb: Enable ASRC in USB voice call path
Telephony downlink ASRC should be enabled for USB. See b/173577733.
Otherwise the downlink ring buffer will underflow or overflow

Bug: 199230403
Test: Local build + Telephony test for five minutes: No glitch observed.
Signed-off-by: Roger Fang <rogerfang@google.com>
Change-Id: Ifbcd9252c97a7f794e0b142e69faf1b0f3041098
2021-09-08 15:06:00 +08:00
Jasmine Cha
7ebc080458 audio: update music playback volume curve
- changes volume 1,2,3,4,5 (due to a sound quality noise floor issue)

Bug: 198224217
Test: manual power test (b/198224217#comment21)

Signed-off-by: Jasmine Cha <chajasmine@google.com>
Change-Id: Ied7e88ad941e8a13e2080da6e2897b9541966dd0
2021-09-03 05:32:23 +00:00
David Li
b82bc02526 audio: update Media Record Tuning Files
R4O6
Update camcorder tunings files for FRC

Reason:
- The SA-lite pipeline is used for 3rd party camcorder/recorder and
    need to be updated tuning for audio quality (b/185293492)
- There is e-Noise issue could be noticed when using 3rd party
    camcorder/recorder

Change list:
Update audio_platform_configuration.xml file so that parameters in
    SA-lite pipeline can be loaded correctly
Update template.xml file to enable feature swapping microphone
    assessment in SA-lite pipeline
Update recording.gatf file for modifing tuning parameters

Validation:
3rd party camcorder/recorder function are good and validation was
    used SD1A.210817.007 (7665414)

Bug: 197492283
Test: forrest build passed
Change-Id: Ifc66519c92935dc4bd14d68a85a491f96429272a
2021-08-27 01:57:46 +00:00
Jasmine Cha
f21fa1b132 audio: update tuning tables (20210826)
Release Notes (R4):
- Retune top volumes for more balanced sound, less harsh
- Heavy emphasis on vocals, both depth and clarity
- DTMF volume curve reduced to better align w/ O6, F2, C2, B9
- SYSTEM volume curve reduced to better align touch sounds
- SYSTEM volume curve copied into AUDIBLE volume curve

Release notes (O6):
- Camera shutter (system sound) decreased volume curve to better align w/ R4/B9 and F2/C2
- Slight adjustment at min vol point for DTMF
- SYSTEM volume curve reduced to mitigate loud camera shutter
- SYSTEM volume curve copied into AUDIBLE volume curve

Bug:190960105
Test: High level tuning validation (b/190960105#comment15)

Signed-off-by: Jasmine Cha <chajasmine@google.com>
Change-Id: Icf0c9e921017b5e06ec950452a78a9d89acf86f2
2021-08-26 01:15:23 +00:00
Robert Lee
09c3fd343f audio: update audio_policy_volumes.xml
Update below stream's volume curves to refine system sound output
from speaker too loud in the lowest volume.

  <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
  <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
  <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
  <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
  <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">

Refine audio-tables.mk location to make sure the xml is updated.

Bug: 195387287
Test: QMC verified
Test: Local built and verified vendor/etc/audio_policy_volumes.xml is correct one

Signed-off-by: Robert Lee <lerobert@google.com>
Change-Id: I13188d7470092448a2660f89d43cf13a56c22edc
2021-08-16 11:27:19 +00:00
Carter Hsu
7ca7fc2c5c audio: dynamic/runtime audio capture switch
Bug: 193042612
Test: build pass and audio capture
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: Ief7d8137a6c636d0c71c7c7ab732dc38d4601a45
2021-08-06 20:54:48 +00:00
Roger Fang
cfaa3174c3 audio: Add command to set PCM steam wait time for voice and audio.
This control is from this patch: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/aoc/+/1962616/

Bug: 194454077
Test: Playing a music then removing the USB headset
Change-Id: Ie9dbf9df13ffaee80c61e2d5da529878fde0b740
Signed-off-by: Roger Fang <rogerfang@google.com>
2021-08-06 17:14:07 +00:00
millerliang
f4cd1362d0 audio: adjust the latency for bluetooth output
HAL can get the device latency from bluetooth headset.
We just to set the latency of the device side.

Bug: 195166550
Test: av sync
Change-Id: Id64b7ea796ddc4de996817d0553f1855b4d9485a
2021-08-06 06:30:03 +00:00
Robert Lee
755a0887fa audio: add Built-In Back Mic device
Bug: 194169487
Test: Test Diagnostic Tools microphone test

Signed-off-by: Robert Lee <lerobert@google.com>
Change-Id: Ice468e91591f5e552e733d187ade86e76896c5b5
2021-07-30 05:26:47 +00:00
millerliang
225b713e1e audio: refine the period size for raw playback
For raw playback, the buffer size needs to equal to the
ring buffer size. AoC changes the buffer size to 16384 bytes,
but it cannot be divisible by 48(1ms frames with 48000 sample rate).
Use the period size(frame couts) from configuration file.

Bug: 194398677
Test: OboeTester->TEST OUTPUT
Change-Id: I07f0cb7d5904e4e3ef78b9a15d31590fdd5a9087
2021-07-29 16:10:07 +00:00
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