Commit Graph

2404 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Shunkai Yao
992b009bc5 Effect AIDL: add Spatializer aidl in audio effect HAL
Spatializer is a union representing parameters for audio spatialization effects

Bug: 273373363
Test: Build
Change-Id: I6e8414238256903aeae171c5b7b7a98fe5f96f89
2023-11-10 05:33:58 +00:00
Mikhail Naganov
2ebe3906ad audio: Fix remote submix configuration and 'prepareToClose'
In the configuration, remove "mono" channel masks.
The legacy implementation always used stereo, the framework
handles channel conversion. Otherwise, the input may
be opened with a different channel mask from the output.

In 'prepareToClose', close the output side of the route.
The framework may close the "old" output stream after
it has opened a new one. A call to 'prepareToClose' means
that the framework thread is already shutting down, thus
it is safe to shut down the route.

Bug: 302036943
Test: atest audioeffect_analysis
Change-Id: I95b57807f2559ef681da822b3cab4ea6b4340143
2023-11-09 14:33:37 -08:00
William Escande
e76315b139 Merge "Add defaults for audio AIDL interfaces" into main 2023-11-08 19:06:32 +00:00
feiyuchen
17c0fe507e Add "system" group to Audio HAL
needed for using EdgeTpu.
Due to this code goes to AOSP, please see CL details and test result in b/289097511#comment24.

Bug: 289097511
Change-Id: Ie0969309346cd85b4bb8ac71860a529710c73345
2023-11-08 17:24:21 +00:00
Shunkai Yao
ca63a36695 Merge "Add defaults for audio AIDL interfaces" into aosp-main-future 2023-11-08 01:41:21 +00:00
Bart Van Assche
a0234940b3 audio: VtsHalAudioCoreModuleTargetTest: Convert a SIGSEGV into an assertion failure
Convert the following segmentation fault into an assertion failure:

 signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0x0000000000000000
 Cause: null pointer dereference
 9 total frames
 backtrace:
       #00 pc 000000000020e532  /data/local/tmp/VtsHalAudioCoreTargetTest/x86_64/VtsHalAudioCoreTargetTest (AudioCoreModuleBase::TearDownImpl()+114) (BuildId: f1bb3c414cf012ccd7d268b4e0c7fefe)
       #01 pc 00000000001c890a  /data/local/tmp/VtsHalAudioCoreTargetTest/x86_64/VtsHalAudioCoreTargetTest (AudioCoreModule::TearDown()+106) (BuildId: f1bb3c414cf012ccd7d268b4e0c7fefe)
       #02 pc 00000000002b62a8  /data/local/tmp/VtsHalAudioCoreTargetTest/x86_64/VtsHalAudioCoreTargetTest (testing::TestInfo::Run()+424) (BuildId: f1bb3c414cf012ccd7d268b4e0c7fefe)
       #03 pc 00000000002b6de4  /data/local/tmp/VtsHalAudioCoreTargetTest/x86_64/VtsHalAudioCoreTargetTest (testing::TestSuite::Run()+804) (BuildId: f1bb3c414cf012ccd7d268b4e0c7fefe)
       #04 pc 00000000002c5c7e  /data/local/tmp/VtsHalAudioCoreTargetTest/x86_64/VtsHalAudioCoreTargetTest (testing::internal::UnitTestImpl::RunAllTests()+2622) (BuildId: f1bb3c414cf012ccd7d268b4e0c7fefe)
       #05 pc 00000000002c50cc  /data/local/tmp/VtsHalAudioCoreTargetTest/x86_64/VtsHalAudioCoreTargetTest (testing::UnitTest::Run()+140) (BuildId: f1bb3c414cf012ccd7d268b4e0c7fefe)
       #06 pc 00000000001c86f0  /data/local/tmp/VtsHalAudioCoreTargetTest/x86_64/VtsHalAudioCoreTargetTest (RUN_ALL_TESTS()+16) (BuildId: f1bb3c414cf012ccd7d268b4e0c7fefe)
       #07 pc 00000000001c8669  /data/local/tmp/VtsHalAudioCoreTargetTest/x86_64/VtsHalAudioCoreTargetTest (main+137) (BuildId: f1bb3c414cf012ccd7d268b4e0c7fefe)
       #08 pc 00000000000547e9  /apex/com.android.runtime/lib64/bionic/libc.so (__libc_init+89) (BuildId: e5ef3cc48c1e014ffb7dbbcfc7f9d475)

Bug: 308687042
Change-Id: I2d528dd9cf0f59bcd6b0e485b4f6141320d89a81
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2023-11-07 13:12:35 -08:00