Commit Graph

1163 Commits

Author SHA1 Message Date
Kuowei Li
9ee709c323 audio: Allow SetAudioProperties to not be supported am: de829572f9 am: 4f21be2965 am: 2950416a76
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1762588

Change-Id: Ice1083c4c6e5f5f924880f3464d961b5687fc2d2
2021-07-23 21:44:07 +00:00
Kuowei Li
2950416a76 audio: Allow SetAudioProperties to not be supported am: de829572f9 am: 4f21be2965
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1762588

Change-Id: I8711fc885403a22d7a09fc51aeb3d6e69ef759ea
2021-07-23 21:28:20 +00:00
Andy Hung
2588d4c379 Merge "Audio: Add memory leak checking for HAL" into sc-v2-dev am: 6a95f0508c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15239828

Change-Id: I28e787f0b3d2755a9d7c39cc05d84bbc4541fab3
2021-07-23 18:30:48 +00:00
Kuowei Li
de829572f9 audio: Allow SetAudioProperties to not be supported
The parameter of sample rate, channel mask and format is not
mandatory to support by Audio HAL. At meantime, there is no
corresponding handle in framework.
Hence, SetAudioProperties should allow reporting not supported.

Bug: 194368657

Test: run vts -m VtsHalAudioV7_0Target
Change-Id: Id0505bfb5d4812dd4c5d31a6e9d72c4c9c0cffa2
2021-07-22 17:44:48 +00:00
Andy Hung
8f836b9499 Audio: Add memory leak checking for HAL
$ adb shell setprop libc.debug.malloc.program android.hardware.audio.service
$ adb shell setprop libc.debug.malloc.options backtrace=8
$ adb shell setenforce 0
$ adb shell pkill audioserver
$ adb shell dumpsys media.audio_flinger

Test: Check the audio flinger dumpsys as above.
Bug: 186054996
Bug: 187462632
Change-Id: I2e8db14b816cc4cd7e1420c538505bf71fa58c97
2021-07-21 17:31:26 -07:00
Yiming Pan
f37db8728a Merge "Update OWNERS for VTS module VtsHalAudioEffectV5_0TargetTest" am: 572e6cb3d5 am: 0194c9ffad
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1771670

Change-Id: Ifb0711aeb29bdb3b4b821b48d81d4646acafe26f
2021-07-20 19:49:18 +00:00
Yiming Pan
572e6cb3d5 Merge "Update OWNERS for VTS module VtsHalAudioEffectV5_0TargetTest" 2021-07-20 19:12:08 +00:00
TreeHugger Robot
7664e979ca Merge "Audio VTS: Make the active microphone query test more robust in V7" into sc-dev am: 997554db63
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15329863

Change-Id: Ib29f036dd1cc1d9d60c5360e51e252dc6a3b17e1
2021-07-20 17:56:25 +00:00
Mikhail Naganov
65a23ad2d4 Audio VTS: Make the active microphone query test more robust in V7
Prior to V7 the test which exercises
IStreamIn.getActiveMicrophones was using a hardcoded
configuration for the input stream. This configuration no longer
works for some of new devices. To fix that, the part of the test
which calls getActiveMicrophones has been moved into a separate
test--a descendant of InputStreamTest which is parametrized
using the actual configuration of the DUT.

Tests for HAL versions prior to V7 are not affected
because they don't use a full parser for the DUT config.

Bug: 193849687
Test: atest VtsHalAudioV7_0TargetTest
Change-Id: I00fe8fedb6bfc6e034387b35c88f954cb2638dfa
Merged-In: I00fe8fedb6bfc6e034387b35c88f954cb2638dfa
2021-07-20 17:40:13 +00:00
TreeHugger Robot
997554db63 Merge "Audio VTS: Make the active microphone query test more robust in V7" into sc-dev 2021-07-20 16:52:02 +00:00
David Li
081fe6adce Merge "audio: make sure to set back to AudioMode::NORMAL after the test case" into sc-dev am: 183f6190a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15310729

Change-Id: Iae9d1f8aabf6d4dcc05e6a7992a638a3eb7297ad
2021-07-20 08:31:21 +00:00
David Li
183f6190a8 Merge "audio: make sure to set back to AudioMode::NORMAL after the test case" into sc-dev 2021-07-20 08:20:47 +00:00
Yiming Pan
d6d0e67e74 Update OWNERS for VTS module VtsHalAudioEffectV5_0TargetTest
Add bug component information.

Test: Tree Hugger
Bug: 143903671
Change-Id: Icca9a6a3864cb3e5148395fa3523a332cb1d2ab3
2021-07-19 17:39:36 -07:00
Mikhail Naganov
e4ce86bfb7 Audio VTS: Make the active microphone query test more robust in V7
Prior to V7 the test which exercises
IStreamIn.getActiveMicrophones was using a hardcoded
configuration for the input stream. This configuration no longer
works for some of new devices. To fix that, the part of the test
which calls getActiveMicrophones has been moved into a separate
test--a descendant of InputStreamTest which is parametrized
using the actual configuration of the DUT.

Tests for HAL versions prior to V7 are not affected
because they don't use a full parser for the DUT config.

Bug: 193849687
Test: atest VtsHalAudioV7_0TargetTest
Change-Id: I00fe8fedb6bfc6e034387b35c88f954cb2638dfa
2021-07-19 23:04:15 +00:00
David Li
238fbcc61a audio: make sure to set back to AudioMode::NORMAL after the test case
If the major version is greater than or equal to 6, the test tries
to set the mode to AudioMode::CALL_SCREEN. However, it doesn't set
back to AudioMode::NORMAL. Replace all ASSERT with EXPECT to ensure the
test can reach to the explicit call to reset to AudioMode::NORMAL.

Bug: 194022995
Test: atest VtsHalAudioV7_0TargetTest
Change-Id: Ib9b6e310965a85b016853b72c60716fa054641c6
2021-07-19 16:26:42 +08:00
Bill Yi
ee86375d3a Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE
Merged-In: I7b187c5e79bf4531bdffc7411a033a7c20a54294
Merged-In: I89cda19ca8521445e1608efbbd07c889cca59601
Merged-In: I89cda19ca8521445e1608efbbd07c889cca59601
Change-Id: I183701b2c03dc63d19c98779388c0b99bae9a4ce
2021-07-12 11:08:26 -07:00
Mikhail Naganov
420a5407cd audio: Fix handling of relative XML include paths in VTS
Pass "no fixup base dirs" flag to the XInclude processor
to avoid modifications of the top-level elements from
included XML files as a result of "fixup."

Added tests to ensure that all relevant XInclude scenarios
work.

Bug: 192619060
Test: atest -host android.hardware.audio.common.test.utility_tests
Change-Id: Id595c9fd30be378d76387ee55a8937e0bf28d1cd
Merged-In: Id595c9fd30be378d76387ee55a8937e0bf28d1cd
2021-07-08 17:29:23 +00:00
TreeHugger Robot
6cef4e021e Merge "audio: Fix handling of relative XML include paths in VTS" into sc-dev am: 3456ce6816
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15193448

Change-Id: I6ed35b4bb6164db803dbf6bb9768a9cd6f07ee58
2021-07-08 16:44:42 +00:00
TreeHugger Robot
3456ce6816 Merge "audio: Fix handling of relative XML include paths in VTS" into sc-dev 2021-07-08 16:31:37 +00:00
Mikhail Naganov
13c6796528 audio: Fix handling of relative XML include paths in VTS
Pass "no fixup base dirs" flag to the XInclude processor
to avoid modifications of the top-level elements from
included XML files as a result of "fixup."

Added tests to ensure that all relevant XInclude scenarios
work.

Bug: 192619060
Test: atest -host android.hardware.audio.common.test.utility_tests
Change-Id: Id595c9fd30be378d76387ee55a8937e0bf28d1cd
2021-07-07 21:08:42 +00:00
TreeHugger Robot
8c77e004fc Merge "Revert "audio: exclude the echo reference device in capture position test"" into sc-dev am: 8c5166b2f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15223272

Change-Id: Ib807c10790e55a4a06ca85417aca146d791dbf9e
2021-07-07 18:35:52 +00:00
Mikhail Naganov
dd0e20eba3 Revert "audio: exclude the echo reference device in capture position test"
This reverts commit b22f307ccf.

Reason for revert: As explained in b/192307382#comment12, the HAL must provide capture positions for the echo reference input regardless of whether there is any actual output.

This should not affect O6/R4 as according to b/192307382#comment10, the VTS tests pass w/o this patch after the HAL has been fixed.

Bug: 192307382
Change-Id: I224bd9de1dcb2e2c8dc138dbfd85f848378aea4f
Test: VtsHalAudioV7_0TargetTest --gtest_filter=*PcmOnlyConfigInputStreamTest*
2021-07-07 17:07:15 +00:00
Carter Hsu
f6927b4bf2 Merge "audio: exclude the echo reference device in capture position test" into sc-dev am: 0700d79feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15152137

Change-Id: I0719d4c7792e71ee15f95b6413ef1dcd5e93885e
2021-07-01 09:40:18 +00:00
Carter Hsu
b22f307ccf audio: exclude the echo reference device in capture position test
Bug: 192307382
Test:
VtsHalAudioV7_0TargetTest --gtest_filter=*PcmOnlyConfigInputStreamTest*
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I4e38e093bc3be7ee54c0c7cce4d1181e260a23bb
2021-06-30 06:55:24 +00:00
Treehugger Robot
30de3670fe Merge "audio: Ignore SIGPIPE in the default audio HAL wrapper" am: 6d6ddd73ee am: 3f1d554b25
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1740273

Change-Id: Ic755ef20e35a231a1e5539051e25258c63adba3a
2021-06-17 22:27:56 +00:00
Mikhail Naganov
9a88b5b110 audio: Ignore SIGPIPE in the default audio HAL wrapper
It could happen that a service process receives a SIGPIPE
while providing a dump due unexpected pipe closure on
the other side. This should not lead to a service
termination. Ignoring SIGPIPE is a normal practice for
system services.

Bug: 191123848
Test: adb shell kill -s 13 <pid-of-audio-hal>
Change-Id: I9c1d170b76aa27203206e8fd2ce2fc3f5431baac
2021-06-17 19:55:16 +00:00
Mikhail Naganov
228a7b1dc9 audio: Fix parsing of arguments in the APM config update script am: b9e244dfc7 am: 188d6412b0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1734893

Change-Id: Ie50832619be016f65074485dea184cc1c692eb83
2021-06-11 22:06:36 +00:00
Mikhail Naganov
b9e244dfc7 audio: Fix parsing of arguments in the APM config update script
The regex for finding "-h[elp]" argument wasn't correct.
As a result, a file name containing "-h" would match.
Fix the regex by requiring that "-h" must appear at the
beginning of the line.

Test: h/i/audio/7.0/config/update_audio_policy_config.sh -h
Test: h/i/audio/7.0/config/update_audio_policy_config.sh -help
Test: h/i/audio/7.0/config/update_audio_policy_config.sh test-help.xml
Change-Id: Ibdf191e95baacc8600daa8b2f19ddc8338f182eb
2021-06-11 08:52:39 -07:00
Steven Moreland
2f0fe27a2b audio HAL - fix UAFs
Bug: 185259758
Test: N/A
Change-Id: I5ec70b098a00746108e10ab39e966607d78c84ae
Merged-In: I5ec70b098a00746108e10ab39e966607d78c84ae
(cherry picked from commit a8ac7cf706)
(cherry picked from commit 7283cbe8cb)
2021-05-20 00:00:57 +00:00
Andy Hung
bec76e8c9e Merge "StreamOut: Fix STREAM_EVENT_CBK_TYPE_CODEC_FORMAT_CHANGED" am: 66ffc5b99a am: 1e1514be04 am: 6660615822
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692490

Change-Id: I5bd4d6fdea2c18c9822ad061cdc24a488b148fb6
2021-05-04 21:54:03 +00:00
Andy Hung
6660615822 Merge "StreamOut: Fix STREAM_EVENT_CBK_TYPE_CODEC_FORMAT_CHANGED" am: 66ffc5b99a am: 1e1514be04
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692490

Change-Id: I97c94630cd48b9a0354c9b76e593ea0205a633b4
2021-05-04 21:37:16 +00:00
Andy Hung
e6e3a17126 StreamOut: Fix STREAM_EVENT_CBK_TYPE_CODEC_FORMAT_CHANGED
Use audio_metadata_byte_string_len method in asyncEventCallback.

Test: atest metadata_tests
Bug: 186894288
Change-Id: I04914bc5b2c778002b53b8f8da5bf29fff5c80f8
2021-04-30 21:07:33 -07:00
Andy Hung
dd1756f22b Merge changes from topics "dra", "dts_uhd", "earc" am: b76d8e27fb am: 0b58fe1496
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692146

Change-Id: Ia8f84c5c03dbf91fafc822ce2b1ef8480f104b7d
2021-04-30 21:28:36 +00:00
Andy Hung
ebb8be17c4 audio: Add device constants for HDMI EARC am: 1f90e1fbf8 am: a21b9b5d4e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690703

Change-Id: I3b2bc500ca14d75ba1d0a6cc04ae6dc8784ae241
2021-04-30 21:28:35 +00:00
Andy Hung
6edb870022 Audio: Add AUDIO_FORMAT_DTS_UHD am: 3c5fcc51f5 am: 24556f0dfe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692125

Change-Id: Iee1f48feeb4e067daef3e46a94145c60a34a33af
2021-04-30 21:28:33 +00:00
Andy Hung
6ce19700eb Audio: Add AUDIO_FORMAT_DRA
China DTMB digital TV.
See SJ/T11368-2006
“Specification for multichannel digital audio coding technology”.

Test: atest AudioFormatTest
Bug: 185950819
Merged-In: I941c4991e598e864babfb888a8827d1625d95990
Change-Id: I941c4991e598e864babfb888a8827d1625d95990
2021-04-29 19:07:10 -07:00
Andy Hung
1f90e1fbf8 audio: Add device constants for HDMI EARC
Implementation check by grep -E -r  "HDMI_ARC|HDMI_EARC" .

Test: atest AudioDeviceInfoTest
Bug: 131385398
Bug: 151781316
Merged-In: Idfe27b468a9f09770a31b6b58d83de77bebc6c80
Change-Id: Idfe27b468a9f09770a31b6b58d83de77bebc6c80
2021-04-29 18:49:43 -07:00
Andy Hung
3c5fcc51f5 Audio: Add AUDIO_FORMAT_DTS_UHD
See ETSI TS 103 491 V1.2.1 (2019-05)
DTS-UHD Audio Format; Delivery of Channels,
Objects and Ambisonic Sound Fields

Test: atest AudioFormatTest
Bug: 184538197
Merged-In: I4123efb29a95a599982af85068f8e4468ff15159
Change-Id: I4123efb29a95a599982af85068f8e4468ff15159
2021-04-29 17:55:16 -07:00
Steven Moreland
f07b44c1f9 audio HAL - fix UAFs am: 7283cbe8cb am: e227bfd15c am: facfee6382 am: da947d5127
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14212414

Change-Id: I7c4ba7e1ed4e7c71e10332ce986bbc7b6aba8f40
2021-04-26 23:10:51 +00:00
Steven Moreland
da947d5127 audio HAL - fix UAFs am: 7283cbe8cb am: e227bfd15c am: facfee6382
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14212414

Change-Id: I50df59e828d44606c2fca8dc44830b5def4f9670
2021-04-26 22:46:24 +00:00
Steven Moreland
facfee6382 audio HAL - fix UAFs am: 7283cbe8cb am: e227bfd15c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14212414

Change-Id: I5b80e2810ef7c4010496687934d93685057d4c82
2021-04-26 22:31:02 +00:00
Andy Hung
9072e5f0db Audio: Add AUDIO_FORMAT_DRA
China DTMB digital TV.
See SJ/T11368-2006
“Specification for multichannel digital audio coding technology”.

Test: atest AudioFormatTest
Bug: 185950819
Change-Id: I941c4991e598e864babfb888a8827d1625d95990
2021-04-20 19:22:22 -07:00
Andy Hung
67047d5a03 Merge changes from topics "24ch Audio HAL", "360RA HAL" am: 2092162bc3 am: a3bba5eb95 am: 24b2eac13a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1677774

Change-Id: I88962b3c79f6a9c056bb0aefb54094d817dba109
2021-04-17 03:54:58 +00:00
Steven Moreland
7283cbe8cb audio HAL - fix UAFs
Bug: 185259758
Test: N/A
Change-Id: I5ec70b098a00746108e10ab39e966607d78c84ae
Merged-In: I5ec70b098a00746108e10ab39e966607d78c84ae
(cherry picked from commit a8ac7cf706)
2021-04-16 18:36:09 +00:00
Andy Hung
3cc6843bd5 audio: Add AUDIO_CHANNEL_OUT_22POINT2 constant
24 channel configuration for immersive audio

See new value in system/media/audio/audio-hal-enums.h.
Define the same enum to HALv7 and update getChannelCount().

Test: atest android.hardware.audio.common@7.0-util_tests
Bug: 185530406
Change-Id: I8dc5e6c504049908fef157b11ffa043ecaeacaf9
2021-04-15 18:22:42 -07:00
Kei Murayama
91ef183cf7 audio: Add AUDIO_CHANNEL_OUT_13POINT_360RA constant
13ch audio constant for 360 Reality Audio.

The enum value is added in system/media/audio/audio-hal-enums.h.
 - Define the same enum to HALv7.
 - Set 13 for the layout from getChannelCount().

Bug: 185100731
Test: Use the value on audio hal and build.
Test: Use the value on audio_policy_configuration.xml and build.
Test: atest android.hardware.audio.common@7.0-util_tests
Change-Id: Ifa37f9be96a94c623e5d4164774c39d05efbbb8b
2021-04-15 17:49:25 -07:00
TreeHugger Robot
1cabad5e1e Merge "audio HAL - fix UAFs" into sc-dev 2021-04-14 00:24:26 +00:00
Steven Moreland
a8ac7cf706 audio HAL - fix UAFs
Bug: 185259758
Test: N/A
Change-Id: I5ec70b098a00746108e10ab39e966607d78c84ae
2021-04-13 20:15:40 +00:00
Andy Hung
cf2ae43ec3 Merge "audio: Add device constants for HDMI EARC" into sc-dev 2021-04-13 00:01:50 +00:00
Jiabin Huang
9898f37ee8 Merge "Count channel mapping number from the back." into sc-dev 2021-04-12 20:16:05 +00:00