Commit graph

1570 commits

Author SHA1 Message Date
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
Dorin Drimus
76ed0594e7 Add more DTS audio encodings to the AIDL interface
Allow the additional DTS encodings (ENCODING_DTS_HD_MA and ENCODING_DTS_UHD_P2) in the audio_policy_configuration.xsd schema file for the AIDL interface.

Change-Id: Id87b5bcbc1729c6d5158770ffd891b32367a877a
Test: atest DtsAudioFormatsTest
Bug: 235469058
Bug: 243789303
2022-11-11 10:54:13 +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
Xin Li
dd05140cda Merge "Merge TP1A.221005.003" am: cf2da65bc8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2240803

Change-Id: I7bdf52783bf67a74294fb2d60335ab1ececd4946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 22:39:27 +00:00
Xin Li
c208de1713 Merge TP1A.221005.003
Merged-In: I1fcfa29d7841a1cb73bafb1ea92f3b1630992ae9
Change-Id: I56a99c984732258849fc58052c65371d5c31e6fc
2022-10-03 13:17:46 -07:00
Florian Mayer
28167c07cc Merge "Revert "Disable FilterTest/1#FilterOutNonVendorTags on HWASan."" am: 4eeda58ce2 am: b07d73591f am: b47346c0e6 am: 1b1b231642
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2234750

Change-Id: Ic9056ed6c9ae107b43834dc99064b918420cc3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 23:13:13 +00:00
Florian Mayer
b47346c0e6 Merge "Revert "Disable FilterTest/1#FilterOutNonVendorTags on HWASan."" am: 4eeda58ce2 am: b07d73591f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2234750

Change-Id: Ieaf3dc9e63114d798875a5fb08de291265aee93e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 22:01:41 +00:00
Florian Mayer
b07d73591f Merge "Revert "Disable FilterTest/1#FilterOutNonVendorTags on HWASan."" am: 4eeda58ce2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2234750

Change-Id: Ie9c89e496eb01c33e714fda2e6baf61c5200062e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 21:30:18 +00:00
Florian Mayer
4eeda58ce2 Merge "Revert "Disable FilterTest/1#FilterOutNonVendorTags on HWASan."" 2022-09-28 21:03:20 +00:00
Florian Mayer
0d8a45944f Revert "Disable FilterTest/1#FilterOutNonVendorTags on HWASan."
This reverts commit 40a4639e51.

Reason for revert: Speculative rollback after fix in b/248637663

Bug: 230535046
Change-Id: I72b5242dbc73587004e31305e3b25c13cc7b5827
2022-09-28 00:25:45 +00:00
Chih-hung Hsieh
c5bc4643c8 Merge "Fix out-of-memory error." am: f4a9ee68a3 am: 3086bb11c9 am: fa6d674608 am: 5872d55a9f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2231087

Change-Id: I85452627831645930befbe6c0115727ad826c4c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 09:10:58 +00:00
Chih-hung Hsieh
fa6d674608 Merge "Fix out-of-memory error." am: f4a9ee68a3 am: 3086bb11c9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2231087

Change-Id: I82c6d06ba75e6f1e6c68fb0a4f8751c628a68cc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 08:17:27 +00:00
Chih-hung Hsieh
3086bb11c9 Merge "Fix out-of-memory error." am: f4a9ee68a3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2231087

Change-Id: Ia916d4d630e56dca34e2dc1572457b621d458540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 07:47:36 +00:00
Chih-hung Hsieh
f4a9ee68a3 Merge "Fix out-of-memory error." 2022-09-27 07:17:21 +00:00
Chih-Hung Hsieh
739fbefe2d Fix out-of-memory error.
Bug: 248637663
Test: atest android.hardware.audio.common@7.0-util_tests android.hardware.audio.common@7.1-util_tests
Change-Id: Ifb41ddc3fbfa8c9db7f3e10cede2155d28d3c8c4
2022-09-24 18:07:38 -07:00
Treehugger Robot
6fc21d49bf Merge changes from topic "aidl_audio_effect_2" am: 89d993d3d8 am: 2ad819f77e am: 57d87401e3 am: 1a4b5143a4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2225480

Change-Id: I693d170673e6145d5d31415007bd08362e0775bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 21:17:44 +00:00
Shunkai Yao
a1074cfb3b AIDL effect: Initial IEffect interface implementation and vts test am: 4590517a96 am: db4ff5da08 am: eb9789c77c am: 60ea774bcb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221633

Change-Id: I62f5c6ced8a8358df6549c1c8a4ddb318d6d2496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 21:17:42 +00:00
Shunkai Yao
c446a14f5d AIDL effect: Initial IEffect interface definition am: 84efa03de3 am: 722b7ced39 am: 4ca9eb0ab3 am: e34c028abb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221632

Change-Id: I18bec90a509dc107b0c44dfb431c651818da7d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 21:17:40 +00:00
Treehugger Robot
57d87401e3 Merge changes from topic "aidl_audio_effect_2" am: 89d993d3d8 am: 2ad819f77e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2225480

Change-Id: I69d4f8290c054e39921ec53b4d4f02345f387570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 20:18:22 +00:00
Shunkai Yao
eb9789c77c AIDL effect: Initial IEffect interface implementation and vts test am: 4590517a96 am: db4ff5da08
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221633

Change-Id: I801025e9b5fdd6b00c14b251ba7bed9ad5808326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 20:18:21 +00:00
Shunkai Yao
4ca9eb0ab3 AIDL effect: Initial IEffect interface definition am: 84efa03de3 am: 722b7ced39
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221632

Change-Id: I847d0d96c17120dc21e0ed3186a9bbe8e28a6ebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 20:18:19 +00:00
Treehugger Robot
2ad819f77e Merge changes from topic "aidl_audio_effect_2" am: 89d993d3d8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2225480

Change-Id: Ie8a3f19253af3b876f12ff4eee61d5005b042047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 19:51:30 +00:00
Shunkai Yao
db4ff5da08 AIDL effect: Initial IEffect interface implementation and vts test am: 4590517a96
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221633

Change-Id: I399fde95f71b4b061406cb68f87f60a5bc0e9ecb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 19:51:28 +00:00
Shunkai Yao
722b7ced39 AIDL effect: Initial IEffect interface definition am: 84efa03de3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221632

Change-Id: I9c18d00acf7fa5c003c506f1d790eb770abad09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 19:51:26 +00:00
Treehugger Robot
955e3896e0 Merge "Sync audio_policy_engine_configuration.xsd with the SDK" am: e8c9684d68 am: cdc677afa4 am: 74693ba072 am: 5c057f6c60
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221636

Change-Id: Idb61ab3949f7cd6cdc15b917591dd6a55db14a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 01:56:11 +00:00
Shunkai Yao
121c6ddc99 AIDL effect: Refine some implementation and test logic.
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest
Change-Id: I5a9bb542872de6c5700fa6b14e124e9b9e206da6
2022-09-22 01:36:58 +00:00
Shunkai Yao
4590517a96 AIDL effect: Initial IEffect interface implementation and vts test
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest
Merged-In: Id64d28af9122e82acd96e3349cf37c3d9728069a
Change-Id: Id64d28af9122e82acd96e3349cf37c3d9728069a
2022-09-22 01:36:00 +00:00
Shunkai Yao
84efa03de3 AIDL effect: Initial IEffect interface definition
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest
Merged-In: I0d02fed5d40a108003e735d3619e2fc7c0ef6332
Change-Id: I0d02fed5d40a108003e735d3619e2fc7c0ef6332
2022-09-22 00:43:47 +00:00
Treehugger Robot
74693ba072 Merge "Sync audio_policy_engine_configuration.xsd with the SDK" am: e8c9684d68 am: cdc677afa4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221636

Change-Id: I8780f35257fd34f0cc9f04f91337f7ce698e4b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:17:02 +00:00
Treehugger Robot
cdc677afa4 Merge "Sync audio_policy_engine_configuration.xsd with the SDK" am: e8c9684d68
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221636

Change-Id: Ifa8f46b6f691b572117f1f6d4b937fc67df52e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:24:43 +00:00
Mikhail Naganov
1cbe492d59 Sync audio_policy_engine_configuration.xsd with the SDK
The audio_policy_engine_configuration.xsd schema was missing
four values for the usage enum. This was causing the VTS
test to fail. These usages must be specified in the audio
policy engine configuration file, otherwise a GTS test fails.

Bug: 245303963
Bug: 246231268
Bug: 246901091
Test: atest VtsHalAudioPolicyV1_0TargetTest
Change-Id: I0161ddb33e52cbca9b425c0cbb4f32f320c43af4
2022-09-21 18:23:06 +00:00
Treehugger Robot
17d3fd165d Merge "audio: Refactor transaction status checks in VTS" am: 857e3d98d8 am: 391bc4c9aa am: 8de860c56d am: 4b62c5c0b1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2215767

Change-Id: I2da30f91aa7d38a36f22cd3cee7ade1a48a1cfb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 04:26:07 +00:00
Treehugger Robot
8de860c56d Merge "audio: Refactor transaction status checks in VTS" am: 857e3d98d8 am: 391bc4c9aa
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2215767

Change-Id: I3b7ce6847678cf5103077aedd45a117106faa239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 03:03:22 +00:00
Treehugger Robot
391bc4c9aa Merge "audio: Refactor transaction status checks in VTS" am: 857e3d98d8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2215767

Change-Id: I71ebe0cd1be796408c05cef88790ec9f492ce102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 02:35:06 +00:00
Mikhail Naganov
00bac4ea16 audio: Refactor transaction status checks in VTS
Introduce a GTest-like macro for validating the transaction
status. Refactor the code of VTS to use it.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I91d9ed03c7fb72f5bee55f94653499960be3e497
2022-09-15 23:58:50 +00:00
Mikhail Naganov
546ce87c95 Merge "audio: Cleanups and refactorings" am: e503e08107 am: ba476fa7b3 am: d2575f7332 am: 89dce2f2ea
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2216142

Change-Id: I5d8df0394cc1d0865d9de533e5f37b352ff4407f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 20:22:28 +00:00
Mikhail Naganov
d2575f7332 Merge "audio: Cleanups and refactorings" am: e503e08107 am: ba476fa7b3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2216142

Change-Id: Id2ca6b2c8639291b340fd858d8751b6eb08839bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:50:05 +00:00
Mikhail Naganov
ba476fa7b3 Merge "audio: Cleanups and refactorings" am: e503e08107
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2216142

Change-Id: Iabe91047ba999c995c49d39129211ea19b2aa2fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:20:12 +00:00
Mikhail Naganov
e503e08107 Merge "audio: Cleanups and refactorings" 2022-09-13 17:55:22 +00:00
Mikhail Naganov
a2c5ddf993 audio: Cleanups and refactorings
Added utility functions for operating on positional
bit flags.

Moved retrieval of offload mix ports to ModuleConfig
utility class.

Clarify the names of read/write tests.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Id20881c2e62bc1b95d8fc3c268f99e36337dce7a
2022-09-12 23:00:42 +00:00
Lorena Torres-Huerta
5a6670a9c5 Merge changes from topic "media_common_types_version_bump" am: e38b08ad47
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2203398

Change-Id: Iccdc82a0eedc5ad67d0a62387562ffae638893ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 23:55:29 +00:00
Lorena Torres-Huerta
72a11980f6 Add AudioAttributes and AudioFlag for use in HAL interface for engine configuration. am: 9ae4f224ab
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2203397

Change-Id: I84a93a066aaeadd9f3cf3f70a92dbe20a814b6e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 23:55:22 +00:00
Lorena Torres-Huerta
4dfb4343e7 Use explicit aidl versions for audio hal and soundtrigger dependencies. am: d38e3f0d4b am: 9a0e2fe4b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19876525

Change-Id: I65889748920f07d3b55e04b96d0ec23e352eb02e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 18:38:11 +00:00
Lorena Torres-Huerta
13792816fa Add AudioAttributes and AudioFlag for use in HAL interface for engine configuration. am: dd2b7eb564 am: 22ca577fe8
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19874524

Change-Id: I5a491aefded9c7dd4ca8f56e4b189d7b45206911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 18:38:00 +00:00
Lorena Torres-Huerta
d38e3f0d4b Use explicit aidl versions for audio hal and soundtrigger dependencies.
There are still issues with importing implicit versions. Switching to explicit versions while b/188871598 is worked out.

Bug: 242678729
Test: m; AIDL_TRANSITIVE_FREEZE=true m aidl-freeze-api && AIDL_FROZEN_REL=true m
Merged-In: Ide6a90716bf042fbb925357e110bc84ddb9e96fb
Change-Id: Ide6a90716bf042fbb925357e110bc84ddb9e96fb
(cherry picked from commit 8296aa824b)
2022-09-07 00:55:19 +00:00
Lorena Torres-Huerta
dd2b7eb564 Add AudioAttributes and AudioFlag for use in HAL interface for engine configuration.
This requires a version bump to android.media.audio.common.types.

cc_defaults and java_defaults are used in order to avoid explicitly updating version references in several Android.bp files when we do future version bumps.

Bug: 242678729
Test: m
Merged-In: Id17820f210f625e370992db4f9f85e37887b088b
Change-Id: Id17820f210f625e370992db4f9f85e37887b088b
2022-09-06 23:14:58 +00:00
Mikhail Naganov
b5a665a326 audio: Add checks to effects feature configs retrieval am: 8e3480edfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19806116

Change-Id: Ief00037cb4237b1a7d3f66fb6287f87e2e0761ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 22:17:06 +00:00
Lorena Torres-Huerta
308e257397 Use explicit aidl versions for audio hal and soundtrigger dependencies.
There are still issues with importing implicit versions. Switching to explicit versions while b/188871598 is worked out.

Bug: 242678729
Test: m; AIDL_TRANSITIVE_FREEZE=true m aidl-freeze-api && AIDL_FROZEN_REL=true m
Merged-In: Ide6a90716bf042fbb925357e110bc84ddb9e96fb
Change-Id: Ide6a90716bf042fbb925357e110bc84ddb9e96fb
(cherry picked from commit 8296aa824b)
2022-09-01 21:57:03 +00:00
Lorena Torres-Huerta
9ae4f224ab Add AudioAttributes and AudioFlag for use in HAL interface for engine configuration.
This requires a version bump to android.media.audio.common.types.

cc_defaults and java_defaults are used in order to avoid explicitly updating version references in several Android.bp files when we do future version bumps.

Bug: 242678729
Test: m
Merged-In: Id17820f210f625e370992db4f9f85e37887b088b
Change-Id: Id17820f210f625e370992db4f9f85e37887b088b
(cherry picked from commit bf94fa32cb)
2022-09-01 21:37:43 +00:00
Shunkai Yao
19a30e0200 AIDL effect: Extract common parts of effect service into cc_defaults am: 43f9a07e04 am: acfc7ae9cb am: 4526d844d1 am: 39be76e891
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198794

Change-Id: I5756aa9ff46e18899d3b29211101f48d2f1968b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 21:16:24 +00:00
Shunkai Yao
4d780e918c AIDL effect: Add vts for the initial effect AIDL interface implementation am: 67b1be60ab am: e0907cf5f2 am: 04428686b9 am: 2970bb4f43
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198793

Change-Id: I9a8ac95b3cf10fbc9c52d7ceae41c6224a73e90f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 21:16:22 +00:00
Shunkai Yao
0f7bf04540 AIDL effect: Minimal example implementation am: c23916b96f am: 082f06b5f0 am: 00367c28e3 am: 6e8e2f1423
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198792

Change-Id: Ica829707ac617e85264e324c6f89369cd0c83869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 21:16:20 +00:00
Shunkai Yao
1cce4bcd4b AIDL effect: Initial IFactory interface definition am: f1d6039f96 am: 2b69b4b29f am: ef34d62d01 am: 303a01a670
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198791

Change-Id: I1c39f7f52d0bb9b16c3672627bcddd01c787de2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 21:16:15 +00:00
Shunkai Yao
4526d844d1 AIDL effect: Extract common parts of effect service into cc_defaults am: 43f9a07e04 am: acfc7ae9cb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198794

Change-Id: I9faeb1598f00db6b59311fb04a09be0be7e3c718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:19:01 +00:00
Shunkai Yao
04428686b9 AIDL effect: Add vts for the initial effect AIDL interface implementation am: 67b1be60ab am: e0907cf5f2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198793

Change-Id: I8469fa932841cf445cab55188c1caa0a61c0ff6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:18:58 +00:00
Shunkai Yao
00367c28e3 AIDL effect: Minimal example implementation am: c23916b96f am: 082f06b5f0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198792

Change-Id: I0b9ebeb6234d007c189139f2b2e6e48a05c5763f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:18:56 +00:00
Shunkai Yao
ef34d62d01 AIDL effect: Initial IFactory interface definition am: f1d6039f96 am: 2b69b4b29f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198791

Change-Id: I314dcdc1ae7a2554b7c7ce2d06f76d313bbb61fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:18:53 +00:00