Commit Graph

2197 Commits

Author SHA1 Message Date
Jooyung Han
13f58a77f3 Merge "Set root elements for xsd_config modules" am: ee8374606a am: 5a73645eb0 am: f371c2e7bc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2596609

Change-Id: Idb0d2297407a5708a8e21362ef39c7a32c371dfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 06:16:20 +00:00
Jooyung Han
ee8374606a Merge "Set root elements for xsd_config modules" 2023-05-30 03:58:25 +00:00
Mikhail Naganov
6723ed8292 audio: Add more legacy channel masks for the input direction am: 310b1c6e7e am: 1b18653358 am: 1ba447bbba
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2599107

Change-Id: Idef166bd1a1546ab11c920081716ace2e72ab2f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 02:27:17 +00:00
Mikhail Naganov
310b1c6e7e audio: Add more legacy channel masks for the input direction
This is in order to achieve a better parity both with
legacy output channel masks and AIDL channel layouts.
The change only affects the XSD schema used to generate
a parser for legacy configuration files.

Bug: 283542128
Test: atest audio_aidl_conversion_tests
Change-Id: Ic69b94f6ec650e0814f0200dbef219567eac9fe2
2023-05-22 13:52:50 -07:00
Mikhail Naganov
c4d15dc1e2 audio: Fix the comment about threading of DriverInterface::init am: 3755134720 am: 1d0e427c27 am: 44ee5be311
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2597780

Change-Id: I54855c70dbc949c327bd737a11b31c23e56cf893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 20:24:11 +00:00
Jooyung Han
16d5af6755 Set root elements for xsd_config modules
This reduces the code size by not generating unnecessary code for
non-root elements.

Bug: 283700992
Test: m
Change-Id: I23bd5c2a0ccc40fded3ca08155ead5f4680c2ed9
2023-05-22 16:43:12 +09:00
Mikhail Naganov
3755134720 audio: Fix the comment about threading of DriverInterface::init
'DriverInterface::init' is called on the same thread as other
interface methods (the worker thread), except
for 'setConnectedDevices'. Update the comment to reflect this,
and rearrange the methods order in the interface.

Bug: 283463913
Test: m
Change-Id: I8937506d20ff8233b4b934c421173ce2bec9d43e
2023-05-19 20:08:53 -07:00
Lorena Torres-Huerta
1016c689c9 audio: Provide code for parsing surround sound config from XML am: aa8f76af92 am: 373c6167f0 am: 628e53a343
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2593365

Change-Id: I94ec749365efc3901dd8f298cb6cefe64fd7a41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:54:58 +00:00
Mikhail Naganov
d24fc51e0c audio: Enable more compile time checks in the default impl am: b511b8aa21 am: 796d7846db am: 7daa2861c5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2592261

Change-Id: I58a138b32c11796cea34491c1bd7477991bb62ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:54:54 +00:00
Lorena Torres-Huerta
aa8f76af92 audio: Provide code for parsing surround sound config from XML
The main change is to convert the result of parsing from XSDC
types to AIDL, and add a VTS test for IConfig.getSurroundSoundConfig.

Extra changes:
  - add 'Unchecked' suffix to conversion functions that do not
    wrap the result into ConversionResult;
  - enable more compile-time checks for the default AIDL service,
    fix issues found.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Icf578b8d28647e6355ed5328599c77d2ca1234f9
2023-05-16 18:00:14 -07:00
Mikhail Naganov
b511b8aa21 audio: Enable more compile time checks in the default impl
Enable "-Wall, Wextra, Werror, Wthread-safety",
fix discovered issues.

Bug: 205884982
Test: m
Change-Id: I0a8d3095dd24dbb3bc7cf6569c1f71945cd55168
2023-05-16 17:54:30 -07:00
Shunkai Yao
492dc40711 Merge "Implement AIDL effect IFacotry::queryProcessing" 2023-05-16 22:38:43 +00:00
Mikhail Naganov
5777253dc1 Merge "audio: Update hardwired configuration" am: cd0609de1e am: 8d5d162c75 am: 787cf6274b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2588185

Change-Id: I37a8f51979da0a50f2aa323f7934469fc88349ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 02:51:20 +00:00
Shunkai Yao
5824efbe84 Implement AIDL effect IFacotry::queryProcessing
Bug: 281572768
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit
Change-Id: I0166786d531437ef52690b92067766879b043a1d
Merged-In: I0166786d531437ef52690b92067766879b043a1d
2023-05-15 23:13:07 +00:00
Mikhail Naganov
26526f15e3 audio: Update hardwired configuration
Fill in address for remote submix devices. Specify correct
connection type for the remote submix output.

Avoid logging entire HAL Engine Config.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I246435e4d3b848b5d0ad9810d13f650603eac76d
2023-05-12 19:44:26 -07:00
Shunkai Yao
1c30c9fbb6 Merge "Implement AIDL effect IFacotry::queryProcessing" into udc-dev am: 686183ef3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23088664

Change-Id: Ib049ed3dce867dbc09006a4459bfbdbfd82179ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 17:35:25 +00:00
Shunkai Yao
89ec63ed09 Implement AIDL effect IFacotry::queryProcessing
Bug: 281572768
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit
Change-Id: I0166786d531437ef52690b92067766879b043a1d
2023-05-12 14:36:23 +00:00
Treehugger Robot
2ba43ea9f3 Merge "Remove Descriptor proxy field from individual effect" 2023-05-10 17:37:29 +00:00
Mikhail Naganov
ba65d8a948 audio VTS: Update 7.0/PolicyConfig
The call to instantiate PolicyConfig was updated
in Iced9d665d018853c4b2a50f4471a545af7bf60bb, however
the version of PolicyConfig class for HIDL HAL 7.x
was not updated accordingly

Bug: 205884982
Bug: 281450557
Test: atest VtsHalAudioV7_0TargetTest
Test: atest HalAudioV7_0GeneratorTest
(cherry picked from https://android-review.googlesource.com/q/commit:a273cdde847a627465458f971f88fa9ce07d4731)
Merged-In: Ic7ed6b186e1d0f1ff853f84ad962c1e4acf17a68
Change-Id: Ic7ed6b186e1d0f1ff853f84ad962c1e4acf17a68
2023-05-09 16:00:54 +00:00
Treehugger Robot
13ec38a16d Merge "audio VTS: Update 7.0/PolicyConfig" am: 9470948681 am: f29fb96f32 am: 331361212e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2582357

Change-Id: I05c469434ec8a9241c904c7665bdb0ace9e3fc49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 11:09:09 +00:00
Mikhail Naganov
a273cdde84 audio VTS: Update 7.0/PolicyConfig
The call to instantiate PolicyConfig was updated
in Iced9d665d018853c4b2a50f4471a545af7bf60bb, however
the version of PolicyConfig class for HIDL HAL 7.x
was not updated accordingly

Bug: 205884982
Bug: 281450557
Test: atest VtsHalAudioV7_0TargetTest
Test: atest HalAudioV7_0GeneratorTest
Change-Id: Ic7ed6b186e1d0f1ff853f84ad962c1e4acf17a68
2023-05-08 13:17:08 -07:00
Shunkai Yao
e0f32c1dd7 Remove Descriptor proxy field from individual effect
This field should be filled by IFactory implementation

Bug: 271500140
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit
Change-Id: I96203b8cd037fd81b0b1d88fc5ca9915df02a919
Merged-In: I96203b8cd037fd81b0b1d88fc5ca9915df02a919
2023-05-03 23:58:29 +00:00
Treehugger Robot
8182edb4ff Merge "Freeze Audio AIDL interfaces" 2023-05-02 23:28:26 +00:00
Treehugger Robot
d58b27177e Merge "audio: Use the canonical direction port direction in ModuleUsb" am: 5a9edcec4c am: bf373e3e72 am: cfa69a37fc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2574275

Change-Id: I46331a449ed7debd9f053e51f7553810cb5791fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 20:16:30 +00:00
Shunkai Yao
2d4ca11e22 Merge "Remove Descriptor proxy field from individual effect" into udc-dev am: 51fd9e9e7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22954886

Change-Id: I9efce61560559bbc2c17984ce1d1b92770dd7d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 18:29:23 +00:00
Mikhail Naganov
85da71a9b5 audio VTS: Update PolicyConfig after AudioPolicyConfig
Make necessary changes to use updated AudioPolicyConfig class.

Bug: 205884982
Test: m VtsHalAudioV6_0TargetTest
Test: atest HalAudioV6_0GeneratorTest
(cherry picked from https://android-review.googlesource.com/q/commit:33a35b5ffbbcbcf8a41d70a8af807d6c16f332c9)
Merged-In: Iced9d665d018853c4b2a50f4471a545af7bf60bb
Change-Id: Iced9d665d018853c4b2a50f4471a545af7bf60bb
2023-05-02 18:14:43 +00:00
Shunkai Yao
51fd9e9e7d Merge "Remove Descriptor proxy field from individual effect" into udc-dev 2023-05-02 17:55:58 +00:00
Mikhail Naganov
376b9bbeeb Merge "audio VTS: Update PolicyConfig after AudioPolicyConfig" am: 9be1cde261 am: 5be609a7f2 am: 3e26e4bdab
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2574777

Change-Id: I5d8d4c5bae4d8a309fbed3a8b24a381447e87d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 17:48:46 +00:00
Treehugger Robot
5a9edcec4c Merge "audio: Use the canonical direction port direction in ModuleUsb" 2023-05-02 17:43:28 +00:00
Mikhail Naganov
9be1cde261 Merge "audio VTS: Update PolicyConfig after AudioPolicyConfig" 2023-05-02 16:34:46 +00:00
Shunkai Yao
dd6ec5291a Freeze Audio AIDL interfaces
Fix Visualizer and Volume type UUID

Bug: 279432911
Test: m
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit
Change-Id: I3e7d145aa37fb67d78cf05c06da22f74c0ea07ad
Merged-In: I3e7d145aa37fb67d78cf05c06da22f74c0ea07ad
2023-05-02 00:55:22 +00:00
Mikhail Naganov
64fd6bd779 audio: Use the canonical direction port direction in ModuleUsb
Instead of relying on the device type, use the 'AudioPort.flags'
field to determine the device direction.

Remove 'isUsbInputDeviceType' and 'isUsbOutputtDeviceType'
as they are too specific to particular device type and just
add a maintenance burden.

Bug: 266216550
Test: m
Change-Id: Ia1b9330c2b419a1a4048ed78d914d05c1caf523f
2023-05-01 13:34:51 -07:00
Mikhail Naganov
33a35b5ffb audio VTS: Update PolicyConfig after AudioPolicyConfig
Make necessary changes to use updated AudioPolicyConfig class.

Bug: 205884982
Test: m VtsHalAudioV6_0TargetTest
Test: atest HalAudioV6_0GeneratorTest
Change-Id: Iced9d665d018853c4b2a50f4471a545af7bf60bb
2023-05-01 13:24:05 -07:00
Shunkai Yao
db026a8ca0 Remove Descriptor proxy field from individual effect
This field should be filled by IFactory implementation

Bug: 271500140
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit
Change-Id: I96203b8cd037fd81b0b1d88fc5ca9915df02a919
2023-05-01 19:07:05 +00:00
Jiabin Huang
b811015579 AHAL: add more comment for IModule.disconnectExternalDevice
Bug: 277955540
Test: TH
(cherry picked from https://android-review.googlesource.com/q/commit:cf210c83b2d29882aa0144a8e52af0d460628b6e)
Merged-In: I0d6a73884ab4bcfec62da45124024e8680155144
Change-Id: I0d6a73884ab4bcfec62da45124024e8680155144
2023-04-28 17:10:05 +00:00
Jiabin Huang
52b3a84ad9 AHAL: add more comment for IModule.disconnectExternalDevice am: cf210c83b2 am: 9d4c534842 am: 4dc9970230
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2569670

Change-Id: Ie305e2bb4ad01b935f2b051a37ea225afc94f19f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:46:34 +00:00
Jiabin Huang
cf210c83b2 AHAL: add more comment for IModule.disconnectExternalDevice
Bug: 277955540
Change-Id: I0d6a73884ab4bcfec62da45124024e8680155144
Test: TH
2023-04-27 23:06:57 +00:00
Vlad Popa
91dc5573f2 Merge "CSD: Load the ISoundDoseFactory dynamically" into udc-dev 2023-04-27 19:01:49 +00:00
Vlad Popa
b742cdf2a0 CSD: Load the ISoundDoseFactory dynamically
Also removed the default implementation of the ISoundDoseFactory which
only provides a dummy SoundDose object. It is better to fall back to the
framework MEL.

Test: manual, logs
Bug: 272260521
Change-Id: I3b49c9ae4af7c4eafaef46de3fc90aa05bd819c4
2023-04-27 10:58:46 +02:00
Shunkai Yao
57f771d49d Fix Visualizer and Volume type UUID
Bug: b/279432911
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit
Change-Id: I3e7d145aa37fb67d78cf05c06da22f74c0ea07ad
2023-04-26 18:49:51 +00:00
Treehugger Robot
43a6934217 Merge "Add EventFlag for effect HAL thread processing" am: fe4b88ab73 am: b91c54705b am: 9bab6aa527
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2529223

Change-Id: Iae1fb8b92e5336073cf00df4b74c7d4b6a0c516d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 18:02:47 +00:00
Treehugger Robot
2e10b87f4a Merge "AHAL: use PCM_FORMAT_INVALID as the termination of format array." am: d10869b255 am: 3c7da0cf68 am: ff4d1519d2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2534999

Change-Id: I23f3ae5779ccd75a1ab0d47129d64945f99d5f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 17:59:49 +00:00
Treehugger Robot
fe4b88ab73 Merge "Add EventFlag for effect HAL thread processing" 2023-04-13 16:57:44 +00:00
jiabin
768c6f94d6 AHAL: use PCM_FORMAT_INVALID as the termination of format array.
Bug: 266216550
Test: make
Change-Id: Ibe2056eb4fdecb14c3e25daa3dbdd769d6433136
2023-04-12 23:46:55 +00:00
Shunkai Yao
41888a2f07 Add EventFlag for effect HAL thread processing
Bug: 261129656
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit

Change-Id: Ibe6052a8c2a182b33e6fe727b8606431dd2f5355
2023-04-11 00:10:50 +00:00
Alex Buynytskyy
ec1198d941 UpsideDownCake is now 34
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I832ab7a8b5445ba85e27bbcf5be64906bfa0e5be
2023-04-07 23:41:20 +00:00
Mikhail Naganov
7b2d12b1f7 audio: Clarify profiles management for external devices
Clarify what should happen to mix port profiles after
connection of an external device. Add a test to verify
this behavior.

Also, add an XML file for the test runner for
VtsHalAudioCoreTargetTest.

Bug: 273252382
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I3381dd29c5922bf31fa3a8ae6fa273597e8333a1
Merged-In: I3381dd29c5922bf31fa3a8ae6fa273597e8333a1
2023-03-30 20:32:00 -07:00
Mikhail Naganov
d5536d9ac6 audio: Add some utility methods, improve logging
Add 'isDefaultAudioFormat' to Utils.h.

Print the module type in 'setModuleDebug'.

Align 'suggestDeviceAddressTag' with framework code.

Bug: 273252382
Test: m
Change-Id: I0248d2e866522a63a745d4af6132b7d2b6a01564
Merged-In: I0248d2e866522a63a745d4af6132b7d2b6a01564
2023-03-30 20:32:00 -07:00
Mikhail Naganov
fe09942d2a audio: Clarify profiles management for external devices
Clarify what should happen to mix port profiles after
connection of an external device. Add a test to verify
this behavior.

Also, add an XML file for the test runner for
VtsHalAudioCoreTargetTest.

Bug: 273252382
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I3381dd29c5922bf31fa3a8ae6fa273597e8333a1
2023-03-30 12:25:49 -07:00
Mikhail Naganov
04b2cdba73 audio: Add some utility methods, improve logging
Add 'isDefaultAudioFormat' to Utils.h.

Print the module type in 'setModuleDebug'.

Align 'suggestDeviceAddressTag' with framework code.

Bug: 273252382
Test: m
Change-Id: I0248d2e866522a63a745d4af6132b7d2b6a01564
2023-03-30 12:25:49 -07:00