Commit Graph

1524 Commits

Author SHA1 Message Date
Shunkai Yao
dd170d7247 Use AIDL effect bundle in effectserviceexampleimpl. am: f0c263b547
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2268147

Change-Id: I12a1a78ae59963291ff8844c8fa638ed201431b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 20:24:32 +00:00
Shunkai Yao
f0c263b547 Use AIDL effect bundle in effectserviceexampleimpl.
Bug: 255361653
Test: atest VtsHalAudioEffectTargetTest
atest VtsHalAudioEffectFactoryTargetTest
atest VtsHalEqualizerTargetTest

Change-Id: Ia50ff5066e007f6a8569114e36f0e4565a6100ea
2022-11-16 18:09:17 +00:00
Treehugger Robot
7f757f3b69 Merge "audio: Add missing GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST" am: 41b932f43e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2303557

Change-Id: I13ce6a16ec1e4782e5acb48d081762235099cae3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 00:11:57 +00:00
Mikhail Naganov
88cb2f4662 audio: Add missing GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST
This fixes test error when on devices that do not have
AIDL HAL.

Bug: 205884982
Bug: 259294358
Test: m
Change-Id: I6cec10f35cd42eb06947bf483555287257a6a58e
2022-11-15 22:11:17 +00:00
Shunkai Yao
f74c951a90 Merge changes from topic "aidl_audio_effect_8_config" am: 6c04ef2c55
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2298337

Change-Id: Idc1ec2888c3ebba37f225cb51cbef212706d8000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 15:50:51 +00:00
Shunkai Yao
6c04ef2c55 Merge changes from topic "aidl_audio_effect_8_config"
* changes:
  Add effect config xml parser in AIDL effect factory
  Support effect config parser in effect AIDL
2022-11-14 15:24:01 +00:00
Mikhail Naganov
224a3b1755 Merge "audio: Make StreamDescriptor::Command a union" am: 2b68543625
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2296167

Change-Id: Ica626ce3d3ea5c3be78efcf5f6e64724a9263c7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-11 05:08:38 +00:00
Mikhail Naganov
2b68543625 Merge "audio: Make StreamDescriptor::Command a union" 2022-11-11 04:34:04 +00:00
Shunkai Yao
60b34b78a4 Add effect config xml parser in AIDL effect factory
Bug: 255361653
Test: parse an example audio_effects.xml
atest VtsHalAudioEffectFactoryTargetTest
atest VtsHalAudioEffectTargetTest
atest VtsHalEqualizerTargetTest

Change-Id: I566aaf814470342f1ef55414889bbd3aea462f9a
2022-11-11 00:14:50 +00:00
Shunkai Yao
52abf0a662 Support effect config parser in effect AIDL
Bug: 255361653
Test: parse an example audio_effects.xml
atest VtsHalAudioEffectFactoryTargetTest
atest VtsHalAudioEffectTargetTest
atest VtsHalEqualizerTargetTest

Change-Id: I086905bcbe113a56767cae45102c84f5250d348e
2022-11-10 22:38:55 +00:00
Treehugger Robot
f9076e396b Merge "audio: Add volume/mute, audio mode, and screen state to IModule" am: c6eb5c9104
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2241542

Change-Id: I6622261df9c36080bb5616bd34477b9157894ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 22:37:22 +00:00
Treehugger Robot
c6eb5c9104 Merge "audio: Add volume/mute, audio mode, and screen state to IModule" 2022-11-10 22:12:41 +00:00
Mikhail Naganov
98334439d5 audio: Make StreamDescriptor::Command a union
Previously StreamDescriptor::Command used to be a parcelable
holding a command code (enum) + a command argument which was
used for one command only. This got replaced with an equivalent
union, where each command w/o arguments is represented by a
'Void' variant, and the command with an argument with a variant
of a corresponding type.

This has the following benefits:

  - the union guarantees that the argument is only set for
    commands that actually use it, thus all related comments
    and validations can be removed;

  - the command dispatch can be turned into an exhaustive
    switch.

To be able to use an exhaustive switch, the 'exit' command
has been exposed at the interface, but marked as 'hal_reserved'.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I3f2c27a48e4d0b7cfce1171244b2eddc1637005f
2022-11-10 21:37:19 +00:00
Mikhail Naganov
3b125b76aa audio: Add volume/mute, audio mode, and screen state to IModule
Add the following methods to IModule:
 - getTelephony;
 - get/setMasterMute;
 - get/setMasterVolume;
 - get/setMicMute;
 - updateAudioMode;
 - updateScreenRotation;
 - updateScreenState;
The "update..." methods are "informational," the HAL may ignore
them and must not raise any errors.

ITelephony currently contains 2 methods:
 - getSupportedAudioModes;
 - switchAudioMode.
This "switchAudioMode" must validate the argument, and must
switch the HAL to the new mode synchronously.

Implement and add VTS tests.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I9174c81fe7d16f7068257051ae5e129b15e82648
2022-11-09 18:55:07 +00:00
Mikhail Naganov
c514b58a86 Merge "audio: Fix HAL reply handling in CompressedOffloadOutputStreamTest" am: 9cce6228ac
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2279888

Change-Id: I91fecffd1787649e4eba2dd89dc65a3549b9cdba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 16:24:08 +00:00
Mikhail Naganov
9cce6228ac Merge "audio: Fix HAL reply handling in CompressedOffloadOutputStreamTest" 2022-11-09 16:02:49 +00:00
Eric Laurent
4a4257a552 Merge "audio: Add audio_policy_configuration.xsd for the parser" am: b40d5856bc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2277566

Change-Id: Ife3b081af873482e7f1df2e7231a9a5aa5322a74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 09:11:21 +00:00
Eric Laurent
b40d5856bc Merge "audio: Add audio_policy_configuration.xsd for the parser" 2022-11-09 08:41:53 +00:00
Shunkai Yao
c93642ad9b Merge "Move equalizer header file to Equalizer folder" am: 220cd046ff
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2291515

Change-Id: I22e08e8e81850d35faa392cf5ab3866b5a2d92db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 21:59:07 +00:00
Shunkai Yao
6c370645c6 Move equalizer header file to Equalizer folder
Bug: 255361653
Test: atest VtsHalAudioEffectTargetTest
atest VtsHalAudioEffectFactoryTargetTest
atest VtsHalEqualizerTargetTest

Change-Id: Ic1f9dedd35ec6cb0c1753106bdd5530f572d31ff
2022-11-08 02:45:25 +00:00
Mikhail Naganov
e9cc09576a Merge changes Ibed7f4c3,I8a9f4f0b am: b1f182cbcb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2213210

Change-Id: I9d8ffdd0b0f4a170f0a2005f85b84d2d0236b9e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 19:02:12 +00:00
Mikhail Naganov
b1f182cbcb Merge changes Ibed7f4c3,I8a9f4f0b
* changes:
  audio: Add pause, resume, and standby stream operations
  audio: Add 'join' method to StreamWorker
2022-11-07 18:33:21 +00:00
Treehugger Robot
2676d3242a Merge "use binder_auto_utils.h ostream" am: a18dea216e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2288036

Change-Id: I4c20f7e351e7efa9d41ea633a2e69c57476e6bbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-05 01:15:35 +00:00
Steven Moreland
52ed38da36 use binder_auto_utils.h ostream
Bug: N/A
Change-Id: I56f39241b35fc1962baf95f4a5c93aff1cbd705c
Test: N/A
2022-11-04 22:12:02 +00:00
Shunkai Yao
ef880df229 Use final specifier for all effects implementation classes. am: 6755d76d9d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2281902

Change-Id: If686f951968b314f7dcbe67b690a20a97681ba53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 02:56:29 +00:00
Shunkai Yao
6755d76d9d Use final specifier for all effects implementation classes.
Avoid inherit from effect implementation class, all
implmentations should inherit EffectImpl directly.

Bug: 255361653
Test: atest VtsHalAudioEffectTargetTest
atest VtsHalAudioEffectFactoryTargetTest
atest VtsHalEqualizerTargetTest

Change-Id: I3c3bd990423be21f2c79f0e797d71b2d7f850dca
2022-11-02 00:26:44 +00:00
Shunkai Yao
317b28bfb7 Merge changes from topic "aidl_audio_effect_6" am: 6acc2e59f4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2278648

Change-Id: Ie360dea8eb569e2581b5e9f482861063c9d204df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 07:07:56 +00:00
Mikhail Naganov
bae409f6c6 audio: Fix HAL reply handling in CompressedOffloadOutputStreamTest
Increase data position based on the HAL consumption of data,
on the production by the test.

Bug: 254806348
Test: atest VtsHalAudioV7_1TargetTest:CompressedOffloadOutputStream/CompressedOffloadOutputStreamTest
Change-Id: I33a86ec62662ba4738c70c15b77ece0135da7d29
2022-11-01 00:16:54 +00:00
Shunkai Yao
76ecedd9d9 Merge "AIDL effect: init effect test case with effect factory service." am: d437d46999
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2275695

Change-Id: I3a0b3f935921ed450b440603d9a1ff802aa9f1ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 22:55:11 +00:00
Shunkai Yao
6afc855087 AIDL effect: Add all aosp effects default implementation
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest
atest VtsHalAudioEffectFactoryTargetTest
atest VtsHalEqualizerTargetTest

Change-Id: I6825ba77ae0707f97e852f0faa52ce3486ba2af5
2022-10-31 22:53:57 +00:00
Shunkai Yao
82a6f7a8ad AIDL effect: Add all aosp effect parameters definition
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest
atest VtsHalAudioEffectFactoryTargetTest
atest VtsHalEqualizerTargetTest

Change-Id: Ice5cac10956c419c04be44f9142b5b2935cacf3b
2022-10-31 22:18:43 +00:00
Shunkai Yao
464775e777 AIDL effect: init effect test case with effect factory service.
Bug: 255578432
Test: atest VtsHalAudioEffectTargetTest
atest VtsHalAudioEffectFactoryTargetTest
atest VtsHalEqualizerTargetTest

Change-Id: Ib73811c602b5fd8f647ede1033ea62ee65e36a0b
2022-10-31 19:15:35 +00:00
Mikhail Naganov
445bb348fc audio: Add audio_policy_configuration.xsd for the parser
The default implementation will include an XML APM config
parser generated from the XSD schema. This CL provides the
schema file. It was copied from HIDL/7.1 and augmented
with new formats.

Bug: 255477173
Test: N/A
Change-Id: Ic0a09ba044d87165441671a2b2601b0a8177e5fa
2022-10-28 22:57:53 +00:00
Mikhail Naganov
cce8e5f39d audio: Add pause, resume, and standby stream operations
Clarify and verify in VTS that the data FMQ of StreamDescriptor
is a transient buffer. The consumer must always read its entire
contents. This is the same behavior as in the HIDL HAL.

Define the state machine for streams and the set of commands for
transferring between states.

Clarify and verify in VTS that the frame counter of the
observable position must never be reset.

Implement commands for the synchronous I/O case.

Refactor stream test logic to simplify testing of state
transitions.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Ibed7f4c3e77852863714f1910112f664b32d5897
2022-10-28 20:58:10 +00:00
Mikhail Naganov
705297317b audio: Add 'join' method to StreamWorker
This is intended for use in tests where the worker
just executes some actions and then exits by itself.
Use of 'join' instead of 'stop' ensures that the
worker goes through all actions.

Bug: 205884982
Test: atest libaudioaidlcommon_test
Change-Id: I8a9f4f0bb786ee606e3b63a9847f414119716a7d
2022-10-20 01:21:01 +00:00
Shunkai Yao
243f9db0aa Merge changes from topic "aidl_audio_effect_5" am: bbefdc5d36
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2254121

Change-Id: I90d029fd5daa9c5726306898741d5516ef5df2b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 22:45:25 +00:00
Shunkai Yao
a4ab38caf0 AIDL effect: Add Equalizer parameters implementation and vts
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest
atest VtsHalAudioEffectFactoryTargetTest
atest VtsHalEqualizerTargetTest

Change-Id: I94b2283ca2aa0e45715e1c9ac3ea6ad809ec2a2c
2022-10-19 19:13:25 +00:00
Shunkai Yao
e3559444b3 AIDL effect: Add Equalizer parameters definition
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest
atest VtsHalAudioEffectFactoryTargetTest
atest VtsHalEqualizerTargetTest

Change-Id: Ice305308379598a8cd286fc14818798e589ffc18
2022-10-19 19:12:57 +00:00
Shunkai Yao
04d571087a Merge "AIDL effect: Add queryProcess in IFactory" am: a682b181d9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2254120

Change-Id: I97a95ffec3187d753fc87a2ab96da0cb31f1ee0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17 18:08:26 +00:00
Shunkai Yao
08b687ded7 AIDL effect: Add queryProcess in IFactory
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest; atest VtsHalAudioEffectFactoryTargetTest
Change-Id: I5518ceaa0ea744e30803fc23996e2a2b48398024
2022-10-15 00:03:37 +00:00
Shunkai Yao
1ae2d776e5 Remove the absolute path in AIDL EQ Android.bp am: bd9c79cbd8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2254955

Change-Id: Ia755c3e3f0858665faae22351b4d88ba90ce4343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-13 23:26:00 +00:00
Shunkai Yao
bd9c79cbd8 Remove the absolute path in AIDL EQ Android.bp
Bug: 253474521
Test: m android.hardware.audio.effect.service-aidl.example; m libequalizer
Change-Id: Ic8ce31572e2fc6c566e306c25350680a7d352709
2022-10-13 18:43:53 +00:00
Shunkai Yao
d8d1f8590d Merge changes from topic "aidl_audio_effect3" am: bc71b029bf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2242342

Change-Id: I09cb0b5fa721cd33741bf0cb3ea0b91bb853d71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-13 02:53:33 +00:00
Shunkai Yao
9eaa089d34 AIDL effect: Add effect AIDL definition am: 0632ae6cd1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2242193

Change-Id: I8ae04c451f965a42efca215985cdd7f1e2154187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-13 02:53:31 +00:00
Shunkai Yao
bc71b029bf Merge changes from topic "aidl_audio_effect3"
* changes:
  AIDL effect: Add effect AIDL implementationi and vts test
  AIDL effect: Add effect AIDL definition
2022-10-13 02:14:39 +00:00
Shunkai Yao
ea24c1a128 AIDL effect: Add effect AIDL implementationi and vts test
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest; atest VtsHalAudioEffectFactoryTargetTest
Merged-In: If8000b7396360996bdfb8eb269bc3de543871673
Change-Id: If8000b7396360996bdfb8eb269bc3de543871673
2022-10-13 02:14:23 +00:00
Shunkai Yao
0632ae6cd1 AIDL effect: Add effect AIDL definition
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest; atest VtsHalAudioEffectFactoryTargetTest
Merged-In: I8cc902df0a396d0703839b8933318a26aab2e38d
Change-Id: I8cc902df0a396d0703839b8933318a26aab2e38d
2022-10-13 02:13:20 +00:00
Xin Li
d2356b1d0a Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master 2022-10-11 17:39:14 +00:00
Lorena Torres-Huerta
7dd1177c21 Merge "Add surround sound configuration to the AIDL Audio HAL interface." am: 9b7a21dc95
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2242833

Change-Id: I3272c432d23d7bfbbd3ba784d27562cc5fe18b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07 20:06:59 +00:00
Lorena Torres-Huerta
0ba91e5759 Add surround sound configuration to the AIDL Audio HAL interface.
Bug: 205884982
Test: m android.hardware.audio.service-aidl.example
Change-Id: Ie8c69c6f0437ba6527c28f525eb06d1e338e3abc
2022-10-06 05:48:22 +00:00