Commit graph

173 commits

Author SHA1 Message Date
Carter Hsu
cfba2b65ad audio: allow mmap-record to set dsp volume am: 7e54d6ddf0 am: 5ad5c95f68
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/18185875

Change-Id: I4ba2b14ca67b68ace065f4689034520e729eb812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:06:35 +00:00
Carter Hsu
7e54d6ddf0 audio: allow mmap-record to set dsp volume
Bug: 231630423
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: Iaafafe9963c102690a89e5d4fe7c63e6783450f1
2022-05-11 03:00:58 +00:00
Jakub Pawlowski
3a3798456c Bluetooth le_audio_output: use dynamic format
The format for output is negotiated, no need to specify it in xml config file.

Bug: 230578655
Test: Play music using LE Audio device
Change-Id: I44fcba0148dc376c72ccd2180d68f403cef873db
2022-05-09 18:49:21 +00:00
Carter Hsu
5ba9b0b842 audio: adjust the digital gain for speaker-mic am: 1a8281331d am: dd9606b894
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17899773

Change-Id: I63c6fea3979147bc068fe04e26cde98168d045c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 10:11:39 +00:00
Carter Hsu
1a8281331d audio: adjust the digital gain for speaker-mic
add mic gain on path "speaker-mic" from 0 to 22

Bug: 228224014
Test: audio record
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: Idafad36fdfb5c5f54e2ad3c1718b814b956ac17c
2022-04-22 09:17:54 +00:00
Eric Laurent
acd8484a5a [automerge] Revert "audio: add immersive output" 2p: 4c4c40aee6 2p: 29f888e144
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17692481

Bug: 223736548
Change-Id: Ib006d7ae8d6cc3c50bfcd3c6e5772d60e5b14697
2022-04-12 16:02:36 +00:00
Eric Laurent
4c4c40aee6 Revert "audio: add immersive output"
This reverts commit 432fc04f64.

Bug: 223736548
Test: make
Change-Id: I242dd4677d0e42e05bed443e4021ca44cddf4daf
2022-04-12 18:02:04 +02:00
Eric Laurent
5f85a1763f resolve merge conflicts of 7b77d473a7 to tm-dev
Revert "DO NOT MERGE Audio configuration for spatial audio"

Bug: 223736548
Test: make
This reverts commit edfc5e86bd.

Change-Id: Ie693f24b76d00469ad71a36989e481023946c3bb
2022-04-12 11:17:09 +02:00
Eric Laurent
0a1b979e6b Audio configuration for spatial audio
Update audio policy and effect configuration files to
support spatial audio feature

Bug: 189423448
Test: make
Change-Id: I2274fb4784eef5e28cadd9f33c38fdbbe60f6b40
2022-03-23 08:57:06 +00:00
justinweng
432fc04f64 audio: add immersive output
Bug: 189423448
Test: build passed.

Signed-off-by: justinweng <justinweng@google.com>
Change-Id: I0a14bd264fb79f56698ab626bd71af7f72e9fff8
2022-03-21 16:06:34 +08:00
Alice Kuo
86c6fb37be Add the audio policy for le audio offload
Bug: 197296692
Test: verify media with HW and SW path pass
Change-Id: If32d85e67822777e040aa6542849a7889e538e18
2022-03-07 16:34:17 +00:00
Yung Ti Su
4a8903fb24 Seperate audio_policy_configuration for a2dp and le
If ro.bluetooth.a2dp_offload.supported == true AND persist.bluetooth.a2dp_offload.disabled == true
use audio_policy_configuration_a2dp_offload_disabled.xml (a2dp X LE X)

If ro.bluetooth.a2dp_offload.supported == true AND persist.bluetooth.a2dp_offload.disabled == false AND
(ro.bluetooth.leaudio_offload.supported == false OR persist.bluetooth.leaudio_offload.disabled == true)
use audio_policy_configuration_le_offload_disabled.xml (a2dp O LE X)

If ro.bluetooth.a2dp_offload.supported == true AND persist.bluetooth.a2dp_offload.disabled == false AND
ro.bluetooth.leaudio_offload.supported == true AND persist.bluetooth.leaudio_offload.disabled == false
use default audio_policy_configuration.xml (a2dp O LE O)

Note:
The above settings are based on ro.bluetooth.a2dp_offload.supported == true condition
If ro.bluetooth.a2dp_offload.supported == false, the content of the default audio_policy_configuration.xml file must be replaced by audio_policy_configuration_a2dp_offload_disabled.xml on the target

Test: manual

Signed-off-by: Yung Ti Su <andysu@google.com>
Change-Id: Ibea329bb5b7d24b18ed3e915c9e7306729b17dfd
2022-03-07 16:34:09 +00:00
Carter Hsu
b68c7cf0b7 audio: add Fortemedia mcps file
Bug: 213020870
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I3699bbbf4e220fce806ac1d61b329b51c65002ae
2022-01-26 06:26:09 +00:00
Jasmine Cha
51dc873256 audio: update FM table (20220105) am: 9ea55c6a31 am: bcb3df9f2e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16564367

Change-Id: Ib603f01e019c5c25906f259d663dc6d76ad0b8c1
2022-01-19 08:28:13 +00:00
Jasmine Cha
9ea55c6a31 audio: update FM table (20220105)
The change is on Headset Blackbird (USB-C earbuds) only.
The changed items are the same on R4 & O6 and the tuning
are also aligned with B3.

1. HE_BB, NB/WB/SWB/FB
  - Apply the same TDDRC gain for each RX volume step
  - Enable RX FFP
  - Fine-tune volume curve
2. Reduce the clipping risk on RX path (SWB and FB RX)
  - Fine tune EQ and TDDRC gain
3. HE_BB, WB_DT improvement
  - TX_EAD_THR: 0x4500 --> 0x36B0

Bug: 213426722
Test: manual test (b/174635995#comment77)

Signed-off-by: Jasmine Cha <chajasmine@google.com>
Change-Id: Iecf9bd5d6150371556680bd493ae3412a1ad5c2e
2022-01-19 07:49:39 +00:00
vincenttew
3f20e9f745 audio: syncing the USB config for mfg am: d0104cfd0d am: ab770e5eeb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16564364

Change-Id: Ifa9343597be3aa660c64798646ac61cd2cf5de9b
2022-01-10 06:32:11 +00:00
vincenttew
d0104cfd0d audio: syncing the USB config for mfg
currently mfg audio tool using audio-recordC usb-headset-mic
in mixer_paths.xml, add a new path for mfg usb recording to
switching the usb mic source

modify the usb alsa control to v2 since the latest alsa control
already changed

Bug: 213027646
Test: verify pass with mfg tool usb-record
Signed-off-by: vincenttew <vincenttew@google.com>
Change-Id: If3af632ed2bddcdd1329f17fc89ea82162d810ae
2022-01-10 05:50:46 +00:00
Carter Hsu
67f708afd9 audio: change primary output to float
Bug: 200293124
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I2a8dbd08a166bc7cedc58fe57e3ff5f6ee4a4f29
2021-12-23 08:02:30 +00:00
Vincent Tew
b6a80452dc Revert "Revert "Update: audio tuning table"" [DO NOT MERGE]
This reverts commit fa1f5094d1.

Reason for revert: MBDRC solution merged, revert the tuning back

Bug: 208931002
Change-Id: I431a1a9117d6c10416c0f94b33643480815e583b
(cherry picked from commit 51e7f7fb3b)
2021-12-06 01:17:13 +00:00
Alice Kuo
11086d832c Add LE audio policy on R4/O6 for development
Bug: 205514628
Test: connect with LE audio device and play music
Change-Id: I648ffd3ed52da5a611f66b199628f8845ff9a376
2021-11-29 19:31:52 +08:00
Vincent Tew
51e7f7fb3b Revert "Revert "Update: audio tuning table"" [DO NOT MERGE]
This reverts commit fa1f5094d1.

Reason for revert: MBDRC solution merged, revert the tuning back

Bug: 205934425
Change-Id: I431a1a9117d6c10416c0f94b33643480815e583b
2021-11-17 16:52:16 +00:00
millerliang
91daad4478 audio: change format of mmap-playback to float
Bug: 201398105
Test: OboeTester
Change-Id: If63d33624100185d1126d8e00df5a14b5da9a4d5
2021-11-17 08:32:56 +00:00
vincenttew
5017f0d504 Revert "Update: audio tuning table" am: fa1f5094d1 am: 1dd04b76b7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16238922

Change-Id: Iedb2eade576e85b58e8e74db76f90741c24ae5bf
2021-11-11 14:01:34 +00:00
vincenttew
fa1f5094d1 Revert "Update: audio tuning table"
This reverts commit 4bfaa9f2f3.

revert reason: the AoC prebuilt MBDRC seems not working after pick
prebuilt ag/16234618, the bug tracking on b/205934425, will apply
this tuning back once the MBDRC can work correctly on sc-v2-dev

Bug: 205934425
Change-Id: I24e2805675360d59d70cd2b5a9095aaf1c8a5875
Signed-off-by: vincenttew <vincenttew@google.com>
2021-11-11 18:20:25 +08:00
vincenttew
052901d64e Update: audio tuning table am: 4bfaa9f2f3 am: 47f0f8d016 am: 5d16114baf
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16191708

Change-Id: I783944beb52e4132676b0b78786e734d75a70f90
2021-11-10 03:49:44 +00:00
vincenttew
5d16114baf Update: audio tuning table am: 4bfaa9f2f3 am: 47f0f8d016
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16191708

Change-Id: I225289b6a55945f3e763ca30a926186427e98ea5
2021-11-10 03:24:37 +00:00
vincenttew
93a1176824 Update: audio tuning table am: 4bfaa9f2f3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16191708

Change-Id: Ief9126fed491ec9893761ad3a61563b4f368fadf
2021-11-10 03:13:57 +00:00
Rios Kao
5bbba35f19 audio: add support for aec recording path am: 7b87bd2241 am: 3bbf4164a4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16057600

Change-Id: I753eb2128dbd90ec314fecc3d5493a4389683d18
2021-11-09 13:56:23 +00:00
Rios Kao
7b87bd2241 audio: add support for aec recording path
Add Audio Capture Eraser Enable to switch
    Eraser for recording path.
    For gain of this path, we shouldn't apply
    software gain, because the input source is
    from hotword pipeline.

Test: build pass
Bug: 172266161
Change-Id: Iabe372e7fe91e557ba9125af14bfb61606c09ea0
2021-11-09 13:05:24 +00:00
vincenttew
4bfaa9f2f3 Update: audio tuning table
Change list:
Update recording.gatf, templete file for modifying parameters to fit
the change of dynamic range compressor(DRC)(b/200794903), the DRC has
been changed from 1 band to 3 band.

Bug: 204745396
Test: build pass
Signed-off-by: vincenttew <vincenttew@google.com>
Change-Id: Ic0962536e50b310a159af15e7e191f130d41e969
2021-11-05 16:41:47 +08:00
Jasmine Cha
6c0b1b1034 audio: waves: add test file for unit test am: e303cad342 am: 0586179b4d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16123776

Change-Id: Ia1c421c8bda6e6a87d0dd70419cdd0c2660516ba
2021-11-02 06:40:07 +00:00
Jasmine Cha
e303cad342 audio: waves: add test file for unit test
Bug: 204272480
Test: atest audio_waves_halcontroller_tests

Signed-off-by: Jasmine Cha <chajasmine@google.com>
Change-Id: I7aa5205c7443692c95b96ac6537d404e0e15d165
2021-11-02 06:18:13 +00:00
Carter Hsu
a435ebb39e audio: change format of deep-buffer to float am: 8ac0f68d29 am: 39b0976a8c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16004194

Change-Id: I1e193c2720313c4781f4c655efaac7dc7e3a5d37
2021-10-26 04:02:07 +00:00
Carter Hsu
07322dbd68 audio: change format of deep-buffer to float
Bug: 201593243
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I20ccdca02a134093846437fdc2f770935485853c
2021-10-26 03:35:38 +00:00
Rios Kao
2c35c05408 audio: add support for aec recording path [DO NOT MERGE]
Add Audio Capture Eraser Enable to switch
    Eraser for recording path.
    For gain of this path, we shouldn't apply
    software gain, because the input source is
    from hotword pipeline.

Test: build pass
Bug: 172266161
Change-Id: I2546e25c8ba428681fd778491cd66dca66051305
2021-10-14 19:17:10 +00:00
Jasmine Cha
278a538154 audio: waves: support custom action identification am: 25c8af397b am: 64a5691078
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16047102

Change-Id: I6be94c25d43a6949265b9f1cfc53790e093ce8d5
2021-10-14 11:51:21 +00:00
Jasmine Cha
0bc1dc0ae1 audio: waves: support custom action identification
Bug: 203029117
Test: build pass, LR mixed

Signed-off-by: Jasmine Cha <chajasmine@google.com>
Change-Id: Ib1e95efb8ea94bd187be7b681b6a94d53e0c5ce1
2021-10-14 06:56:03 +00:00
David Li
b05fb91f60 audio: Update tuning table for removing the risk of blocking rear microphone in 3rd party recorder use case am: 42ed6f18e0 am: 9781ca965c am: 2f37db27c4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16013672

Change-Id: Ic100b9092fd578d1f91ae421f9f30650c1d7ca77
2021-10-09 01:32:38 +00:00
David Li
24d99a3950 audio: Update tuning table for removing the risk of blocking rear microphone in 3rd party recorder use case am: 42ed6f18e0 am: 9781ca965c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16013672

Change-Id: I4cea9ffef4f31e8bbcf5166e3ddf96ea431d94f3
2021-10-09 01:18:59 +00:00
David Li
398917cf16 audio: Update tuning table for removing the risk of blocking rear microphone in 3rd party recorder use case am: 42ed6f18e0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16013672

Change-Id: I36a88e8bd01889196a1733236b0ca858adbe7f85
2021-10-09 01:02:50 +00:00
David Li
65bb51f95f audio: Update tuning table for removing the risk of blocking rear microphone in 3rd party recorder use case
Reason:
-Change the microphone assignment from rear mic to top mic since there is a risk that the rear mic will be blocked when users put devices on the desk.

Change list:
Update recording.gatf file for changing microphone assignment in handset_mono_mic usecase

Validation:
3rd party camcorder/recorder and GCA function are good and validation was used SD1A.210817.026 (7772856)

Bug: 202467646
Test: forrest build
Change-Id: I3b0f8a7ba590925fc70f28bdd3bbb4b29938fd68
2021-10-09 00:46:29 +00:00
Carter Hsu
5c6e991c0d audio: update O6/R4 Aaram volume curve am: e5484251ec am: df94b156aa am: fc517ba9b0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16005300

Change-Id: I170ce24c3ca694f954e3713d64b522b1f4548477
2021-10-08 08:33:17 +00:00
Eric Laurent
f5663a145f audio config: fix minimum alarm volume am: d9f59c1496 am: 652fb4f952 am: f648a35753
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/15958180

Change-Id: Ib53681eb8e2f8a90aacf98f0377d67fa651f7c3e
2021-10-08 08:33:16 +00:00
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
4d42f48baf audio: update O6/R4 Aaram volume curve am: e5484251ec
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16005300

Change-Id: I1ef019c1be30e2fd4b65a70edce264b679d117ab
2021-10-08 08:07:01 +00:00
Eric Laurent
442155a8c8 audio config: fix minimum alarm volume am: d9f59c1496
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/15958180

Change-Id: I09ca426b6aea65559fcc5e69ab354af6664b7449
2021-10-08 08:07:00 +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
Robert Lee
6c3610ca4f audio: update speaker protection bin am: 753a76d114 am: c057d325d3 am: a6426a1d24
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/15998330

Change-Id: Ic4ad70a803a823186ac8f4ef393e9618e34308fc
2021-10-07 04:13:26 +00:00