Commit Graph

2691 Commits

Author SHA1 Message Date
Shunkai Yao
4181e7db41 Merge "Effect AIDL: add AudioTrack metadata as a common parameter for effects" into main 2023-12-01 18:29:21 +00:00
Cole Faust
85b661ae19 Remove symlink to audio_effects_conf.xsd
A change is being made so that sandboxed actions need to add a
dependency on the targets of the symlinks they use. All xsd_config
modules use sandboxing by default.

In this case, the symlink isn't necessary, and we can just depend
on the audio_effects_conf_V2_0 genrule instead.

Bug: 307824623
Test: Presubmits
Change-Id: Ia3c2e8adced78b39881d8c0390c881c0d28ecde4
2023-11-30 14:13:28 -08:00
Treehugger Robot
1b73a5ac35 Merge "Remove symlink to audio_effects_conf.xsd" into main am: f75750965f am: c92314a03b am: 89bb7a765c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2853029

Change-Id: If4aa8cf668d8651a8fdb38f1798a4aff8d160b65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 03:54:47 +00:00
Treehugger Robot
89bb7a765c Merge "Remove symlink to audio_effects_conf.xsd" into main am: f75750965f am: c92314a03b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2853029

Change-Id: Iea7a4c8fb3cc7bd63b543216a7a99febef1f7f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 03:23:38 +00:00
Treehugger Robot
e2912b9c83 Merge "Remove symlink to audio_effects_conf.xsd" into main am: f75750965f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2853029

Change-Id: I1da99bc70377ee3dd00eed40f5494aa7c47883df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 03:15:48 +00:00
Treehugger Robot
f75750965f Merge "Remove symlink to audio_effects_conf.xsd" into main 2023-11-30 02:15:49 +00:00
Cole Faust
36efc06267 Remove symlink to audio_effects_conf.xsd
A change is being made so that sandboxed genrules need to add a
dependency on the targets of the symlinks they use.

In this case, the symlink isn't necessary, and we can just depend
on the audio_effects_conf_V2_0 genrule instead.

Bug: 307824623
Test: m audio_effects_conf_V4_0
Change-Id: I6ddaa81e08d7c4a9c29412b11a08f1d6b88689b5
2023-11-29 13:49:21 -08:00
Devin Moore
855a857014 Merge "Register bluetooth.audio in the audioservice AIDL example" into main am: 6504238fd7 am: 506464d703 am: 125806ada7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2850408

Change-Id: I8cbe16fe22be353ffbf80fb72b35778bd88cea6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 20:02:55 +00:00
Devin Moore
cc1365ffec Merge "Register bluetooth.audio in the audioservice AIDL example" into main am: 6504238fd7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2850408

Change-Id: I722ea95b33d284b7b6ae2dc1efd253e0d7558e88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 19:24:31 +00:00
Devin Moore
125806ada7 Merge "Register bluetooth.audio in the audioservice AIDL example" into main am: 6504238fd7 am: 506464d703
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2850408

Change-Id: I39b90749b8b8100006d7f2233a468fc3fb9fc50a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 19:16:48 +00:00
Devin Moore
6504238fd7 Merge "Register bluetooth.audio in the audioservice AIDL example" into main 2023-11-29 18:15:31 +00:00
Shunkai Yao
421ca19c14 Effect AIDL: add AudioTrack metadata as a common parameter for effects
Bug: 307368176
Test: m android.hardware.audio.effect-update-api
Test: atest --test-mapping hardware/interfaces/audio/aidl
Change-Id: I5affc96c09445a425361f326f728b8ef9b04daee
2023-11-29 17:04:58 +00:00
Mikhail Naganov
d1db3a1d56 Merge "audio: Fix parsing of I/O flags from XML config" into main am: 1a7cdeef2b am: bac3fc05df am: b0accaec4a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2850161

Change-Id: I99b1146da9b728c8a23aa6ff1e4a932776b9a687
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 04:59:19 +00:00
Mikhail Naganov
b0accaec4a Merge "audio: Fix parsing of I/O flags from XML config" into main am: 1a7cdeef2b am: bac3fc05df
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2850161

Change-Id: Ib12f86dc62a1aa1d9b52dfc780ebc5964266a2c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 04:28:10 +00:00
Mikhail Naganov
b4e75acbb9 Merge "audio: Fix parsing of I/O flags from XML config" into main am: 1a7cdeef2b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2850161

Change-Id: Idbf91f8e6104b3b972f1fa987a6967fff9782ba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 04:22:33 +00:00
Mikhail Naganov
1a7cdeef2b Merge "audio: Fix parsing of I/O flags from XML config" into main 2023-11-29 03:12:06 +00:00
Mikhail Naganov
37fe9e84b5 audio: Fix parsing of I/O flags from XML config
The XML parser was missing a step to convert a value
from legacy domain into AIDL.

Bug: 293384960
Test: parse config with AUDIO_OUTPUT_FLAG_VOIP_RX
Change-Id: I1e7778cbf093c2a393e9b2431c9a72b6020cf7be
2023-11-28 17:12:25 -08:00
Devin Moore
0b2b93dccd Register bluetooth.audio in the audioservice AIDL example
android.hardware.bluetooth.audio should really be registered in its own
process, but this is a temporariy solution that is similar to the
old HIDL example.

Test: launch_cvd
Bug: 312265159
Change-Id: Ib60e2654d3b751bedf256d90de72921210174fe4
2023-11-29 00:13:18 +00:00
Mikhail Naganov
af29cd7e7e Fix after aosp/2836447 am: d664a63cf4 am: 4b200f5e55 am: b153b6e4c2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2848064

Change-Id: I5dc5d3f251911eba2b7a9b49781b88fadbb9a151
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28 04:08:20 +00:00
Mikhail Naganov
4b200f5e55 Fix after aosp/2836447 am: d664a63cf4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2848064

Change-Id: I4c364ff7936054a59ea4fe81bed4772ff0e16d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28 03:04:44 +00:00
Mikhail Naganov
d664a63cf4 Fix after aosp/2836447
Update 'memset' in StreamPrimary to fill the entire buffer.

Bug: 302132812
Bug: 302587331
Test: atest CtsMediaAudioTestCases
Change-Id: I6c2e0fc9ab49b35a9484ac3a900aefa9aa98315c
2023-11-27 17:31:04 -08:00
Shunkai Yao
012e3d6861 Merge "Effect AIDL: skip volume checking" into main am: a1d092a818
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2848053

Change-Id: I3211d82b5ef07eb905557c604ba6ea1f83ab2456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27 20:45:00 +00:00
Shunkai Yao
a1d092a818 Merge "Effect AIDL: skip volume checking" into main 2023-11-27 20:03:49 +00:00
Mikhail Naganov
b6c97c04a3 Merge "audio: Adjust default impl for non-RT audio behavior of AVD" into main am: 8062a77307 am: 3bb96fe48b am: ccbb3e1ad7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2836447

Change-Id: Ic8ea353189b17d77be70906fce8ebc1e0553f1a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27 19:46:12 +00:00
Mikhail Naganov
3bb96fe48b Merge "audio: Adjust default impl for non-RT audio behavior of AVD" into main am: 8062a77307
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2836447

Change-Id: I645533b75063f3e80717afa5427262f65289f63a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27 18:51:26 +00:00
Mikhail Naganov
8062a77307 Merge "audio: Adjust default impl for non-RT audio behavior of AVD" into main 2023-11-27 18:50:48 +00:00
David Li
1a56fdda2d Effect AIDL: skip volume checking
Bug: 310751043
Test: atest VtsHalAudioEffectTargetTest
Change-Id: I1b8b32ba7cd33ac3c00637ca86e041f1f58c69f3
Merged-In: I1b8b32ba7cd33ac3c00637ca86e041f1f58c69f3
2023-11-27 16:52:54 +00:00
David Li
942498c7b5 Merge "Effect AIDL: skip volume checking" into main 2023-11-21 08:25:00 +00:00
David Li
876879db95 Effect AIDL: skip volume checking
Bug: 310751043
Test: atest VtsHalAudioEffectTargetTest
Change-Id: I1b8b32ba7cd33ac3c00637ca86e041f1f58c69f3
2023-11-20 10:48:55 +08:00
Shunkai Yao
9f88a2a651 Merge "Add Headtracking connection mode for Spatializer AIDL" into main am: 17017a2aa4 am: a3c120c31a am: 40181c1eae
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2835087

Change-Id: Icbb99534874b7365b20bfca56aee238d1b1b1444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-18 02:36:29 +00:00
Shunkai Yao
a3c120c31a Merge "Add Headtracking connection mode for Spatializer AIDL" into main am: 17017a2aa4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2835087

Change-Id: I9103d611f4e116f908744158f832ea95f3e83d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-18 01:34:30 +00:00
Mikhail Naganov
6c419352c2 audio: Adjust default impl for non-RT audio behavior of AVD
The default implementation of the primary HAL is intended to
work with the AVD. Current implementation of virtualized audio
I/O on AVD falls behind actual hardware in terms of I/O timing.
This is not tolerated by CTS tests which are tailored for
real hardware.

Make the primary HAL implementation more resilient to irregular
ALSA read/write behavior on AVD by prolonging I/O time, or
skipping operations when falling behind expected time.

Bug: 302132812
Bug: 302587331
Test: atest CtsMediaAudioTestCases
Change-Id: Ia290d9541a8a0e22d28024f7930ef554396d63c6
2023-11-17 13:39:28 -08:00
Shunkai Yao
d5b19ea384 Add Headtracking connection mode for Spatializer AIDL
Bug: 311474218
Test: m android.hardware.audio.effect-update-api
Test: m
Change-Id: I2578cc37f55000d881211048a10256e67aa26532
2023-11-17 04:27:23 +00:00
Treehugger Robot
41d67f2327 Merge "audio: Add a missing include to ModuleConfig.cpp" into main am: 035672eb61
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2825166

Change-Id: I90eaeaa59f12726b035dc001e7e4602a0b74aaa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 20:27:21 +00:00
Treehugger Robot
035672eb61 Merge "audio: Add a missing include to ModuleConfig.cpp" into main 2023-11-16 19:47:54 +00:00
Mikhail Naganov
a0ac0c68ae Merge "audio: Fix remote submix configuration and 'prepareToClose'" into main am: 8a4394f8b8 am: ba113931bd am: d78eccd302
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2825161

Change-Id: I91f58ed3628611f59463fd039fa10e1bb5b10ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 17:50:42 +00:00
Mikhail Naganov
d78eccd302 Merge "audio: Fix remote submix configuration and 'prepareToClose'" into main am: 8a4394f8b8 am: ba113931bd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2825161

Change-Id: I739d4f7e7caf82aa3d1dd31976b8caf2d3873069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 17:18:29 +00:00
Mikhail Naganov
ba113931bd Merge "audio: Fix remote submix configuration and 'prepareToClose'" into main am: 8a4394f8b8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2825161

Change-Id: I370c8367226ef33724605f22354f8b3008becd41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 16:45:37 +00:00
Mikhail Naganov
8a4394f8b8 Merge "audio: Fix remote submix configuration and 'prepareToClose'" into main 2023-11-15 16:10:04 +00:00
Andy Hung
34f5b91490 Merge "frameCountFromDurationUs: Avoid integer overflow" into main am: 4cf75592a3 am: 9f1b5aceac am: 544b54bd65
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2824592

Change-Id: I72823ad4a6fe8663b12b43ab8f2c6750e2a235ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 05:08:27 +00:00
Andy Hung
544b54bd65 Merge "frameCountFromDurationUs: Avoid integer overflow" into main am: 4cf75592a3 am: 9f1b5aceac
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2824592

Change-Id: I476f60202942649e092be2e8515ba09562299301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 04:36:29 +00:00
Andy Hung
9f1b5aceac Merge "frameCountFromDurationUs: Avoid integer overflow" into main am: 4cf75592a3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2824592

Change-Id: Ide582f21f71dce662bc9d1ad617c47fc183140eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 04:05:40 +00:00
Andy Hung
4cf75592a3 Merge "frameCountFromDurationUs: Avoid integer overflow" into main 2023-11-15 03:31:58 +00:00
Mikhail Naganov
bfbab9ec12 Merge "audio: Add a missing include to ModuleConfig.cpp" into udc-dev-plus-aosp am: ce8fb68b41
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/25341215

Change-Id: I745cb3a1e12ca83fe888a4d6e34939235f086cb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 02:04:50 +00:00
Mikhail Naganov
6198ad3883 audio: Add a missing include to ModuleConfig.cpp
This module uses logging, however it did not include
the corresponding header.

Bug: 308706390
Test: build source tree
Change-Id: I1b3b5d8c5118b4f56cb0fe0c2bafd1ff30a6ca41
Merged-In: I1b3b5d8c5118b4f56cb0fe0c2bafd1ff30a6ca41
2023-11-14 01:52:09 +00:00
Mikhail Naganov
ce8fb68b41 Merge "audio: Add a missing include to ModuleConfig.cpp" into udc-dev-plus-aosp 2023-11-14 01:46:40 +00:00
Mikhail Naganov
c74fe57c00 audio: Add a missing include to ModuleConfig.cpp
This module uses logging, however it did not include
the corresponding header.

Bug: 308706390
Test: build source tree
Change-Id: I1b3b5d8c5118b4f56cb0fe0c2bafd1ff30a6ca41
Merged-In: I1b3b5d8c5118b4f56cb0fe0c2bafd1ff30a6ca41
2023-11-13 20:51:16 +00:00
Shunkai Yao
12731f66da Merge "Effect AIDL: add Spatializer aidl in audio effect HAL" into main am: 69bc4e0711 am: a1bbe741af am: ad83f29dd0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486775

Change-Id: I4ea08ff428ea9daa29a732d05c27c2c3544c0755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 20:18:28 +00:00
Shunkai Yao
a1bbe741af Merge "Effect AIDL: add Spatializer aidl in audio effect HAL" into main am: 69bc4e0711
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486775

Change-Id: I09ae828de8aac51d8a788a73fc25bd96541cdc89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 19:07:26 +00:00
Michael Chan
76f06f2c6a frameCountFromDurationUs: Avoid integer overflow
Change-Id: Ifbeab2724172f0adc113d6f8852a6f8ae7870817
2023-11-13 16:53:36 +11:00