Commit Graph

2613 Commits

Author SHA1 Message Date
Yi Kong
62b951e58b Fix -Wunused-variable compiler warning am: 810d41a774 am: 4eeda91a4a am: 76705af803
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2861356

Change-Id: I00242599f1a67f59a8e2f415ffa52231d54007dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 13:50:56 +00:00
Yi Kong
4eeda91a4a Fix -Wunused-variable compiler warning am: 810d41a774
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2861356

Change-Id: I3383d70ff4387df65a0fdcaf0004061e5ad0c9a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 12:29:41 +00:00
Yi Kong
810d41a774 Fix -Wunused-variable compiler warning
Test: presubmit
Change-Id: I146d3435fe76da7f300452a14b62ce430c38ae36
2023-12-06 14:03:58 +09:00
Shunkai Yao
bffdaa9d19 Merge "DownmixProcess: Add tests to validate the downmix process." into main am: ab269e2fc7 am: 947f4f776c am: 149564ad7e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2849236

Change-Id: I34f8bdbee50ae15145272544c5546f3ab6aaef15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 02:51:32 +00:00
Shunkai Yao
149564ad7e Merge "DownmixProcess: Add tests to validate the downmix process." into main am: ab269e2fc7 am: 947f4f776c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2849236

Change-Id: I1243ef5458a13b72658ce8d236ce770e0d4552d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 02:17:50 +00:00
Shunkai Yao
157e954972 Merge "DownmixProcess: Add tests to validate the downmix process." into main am: ab269e2fc7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2849236

Change-Id: I5e75d980c2e8bfcea9eea304f9f470c95d3a60d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 01:28:17 +00:00
Shunkai Yao
ab269e2fc7 Merge "DownmixProcess: Add tests to validate the downmix process." into main 2023-12-06 00:35:39 +00:00
Mikhail Naganov
04b72a2c81 Merge "audio: Adjust after "bus" device type change" into main am: a0df73110e am: 727289b30d am: 2f397365a6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2858026

Change-Id: I50e5c1f17014823891bf59542066bc13547c2198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 21:01:11 +00:00
Mikhail Naganov
2f397365a6 Merge "audio: Adjust after "bus" device type change" into main am: a0df73110e am: 727289b30d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2858026

Change-Id: Ic8efc0c90748ee2a18e324cbebacbfd03063422e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 20:06:55 +00:00
Mikhail Naganov
c9ba98773a Merge "audio: Adjust after "bus" device type change" into main am: a0df73110e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2858026

Change-Id: Idf6666c4f30e3a75cc0f750cfd89b484f798645f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 19:37:31 +00:00
Sneha Patil
f533b50925 DownmixProcess: Add tests to validate the downmix process.
Added methods to set and validate parameters.
Added test to verify multichannel to stereo conversion for STRIP type.
Added test to verify multichannel to stereo conversion for FOLD type.

Bug:314953788
Test: atest VtsHalDownmixTargetTest
Change-Id: I31ee4df3eac6ae42e3e3cabebd1622e860581eab
2023-12-05 22:09:05 +05:30
Mikhail Naganov
43269bc713 audio: Adjust after "bus" device type change
The `CONNECTION_BUS` constant is deprecated.
`{IN|OUT}_BUS` should be used instead of `{IN|OUT}_DEVICE`
for clarity.

Bug: 303926380
Test: m
Change-Id: I73365abbcc16550875cf307eafa46b1200698df4
2023-12-04 14:51:49 -08:00
Mikhail Naganov
992921a9af Merge "audio: Fix remote submix module I/O timing and atomicity" into main am: 5260337cbb am: 73ddfafe34 am: bede03bbdf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2855474

Change-Id: Ic6f8482082084dc5652218473f472a8371c984b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 06:16:01 +00:00
Mikhail Naganov
73ddfafe34 Merge "audio: Fix remote submix module I/O timing and atomicity" into main am: 5260337cbb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2855474

Change-Id: I8009303c123c5475efcc1744372345a37439f782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 05:25:06 +00:00
Mikhail Naganov
5260337cbb Merge "audio: Fix remote submix module I/O timing and atomicity" into main 2023-12-04 04:48:42 +00:00
Treehugger Robot
87b8907482 Merge "Remove symlink to audio_effects_conf.xsd" into main am: a35b13c3a3 am: db66183a36 am: bc977d3f9a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2852787

Change-Id: I707bcccb9c949730d07975a681c84821b5a1147a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-02 08:26:17 +00:00
Treehugger Robot
bc977d3f9a Merge "Remove symlink to audio_effects_conf.xsd" into main am: a35b13c3a3 am: db66183a36
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2852787

Change-Id: I3c7c54d0561c1bbcb46eccbba2e571a3742c8b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-02 07:55:37 +00:00
Treehugger Robot
36ddf736c6 Merge "Remove symlink to audio_effects_conf.xsd" into main am: a35b13c3a3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2852787

Change-Id: Ic85730de1446cf6411cc7d720354cd922fa244a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-02 07:39:52 +00:00
Treehugger Robot
a35b13c3a3 Merge "Remove symlink to audio_effects_conf.xsd" into main 2023-12-02 06:30:35 +00:00
Mikhail Naganov
0608545377 audio: Fix remote submix module I/O timing and atomicity
Similar to the primary module implementation, align the time
spent in the transfer operation with the duration of audio.

Change the read operation to ingest as much data as possible
during the audio burst duration.

Ensure that checking the existence of a SubmixRoute and adding
a new one is an atomic operation.

Minor improvements to avoid extra synchronization.

In the configuration, change the limit of max open streams to 10
to match the legacy implementation.

Bug: 302132812
Test: atest CtsMediaAudioTestCases --test-filter=".*AudioPlaybackCaptureTest#testPlaybackCaptureDoS"
Change-Id: Iccb6aaac46c039551c3d5f7760b1459168d9cfe5
2023-12-01 16:39:52 -08:00
Shunkai Yao
59e3c1da45 Merge "Effect AIDL: add AudioTrack metadata as a common parameter for effects" into main am: 4181e7db41 am: cbc5cad748 am: 578ecd2f20
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2850160

Change-Id: I0f274ef3f864d7dae8b57ec1894f11642a552ff5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:24:58 +00:00
Shunkai Yao
cbc5cad748 Merge "Effect AIDL: add AudioTrack metadata as a common parameter for effects" into main am: 4181e7db41
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2850160

Change-Id: I42f97ff90df079fa1344207402f2ef182b2eba52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 18:46:51 +00:00
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