Vlad Popa
e32ffaec3b
Merge "CSD: Adjust code to new MelCallback interface" into main
2024-01-09 17:17:32 +00:00
Shunkai Yao
4ee5ce9b0b
Merge "Effect AIDL: add IEffect.reopen to update the effect instances data FMQ" into main
2024-01-09 03:50:59 +00:00
Shunkai Yao
e400c835a2
Effect AIDL: add IEffect.reopen to update the effect instances data FMQ
...
The effect instance may choose to reallocate the input data message
queue under specific conditions. For example, when the input format
changes, requiring an update to the data message queue allocated during
the open time.
In such cases, the effect instance can destroy the existing data message
queue, when the audio framework see a valid status MQ and invalid data MQ,
it call reopen to get the new data message queue.
Bug: 302036943
Test: m android.hardware.audio.effect-update-api, m
Change-Id: Ia245b154176f64bc3cc6e6049bca4f9c68ad482d
2024-01-05 22:51:15 +00:00
Vlad Popa
3ee7690028
CSD: Adjust code to new MelCallback interface
...
Added the attenuated bool to the callback interface. Not used
Test: trivial
Bug: 315218453
Change-Id: Ibd5e90b0537bfce7d01ee7a3a0e55bc53850a216
2024-01-04 01:53:41 -08:00
Mikhail Naganov
5f8f8cc16b
Merge "audio: Fix the type used for timekeeping" into main am: e3ed739865 am: da3b33a4f4 am: 6178a82724
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2894924
Change-Id: I6dead6af17b8364d52548c5d73e0984e1341d18e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-04 02:38:49 +00:00
Mikhail Naganov
e3ed739865
Merge "audio: Fix the type used for timekeeping" into main
2024-01-04 01:26:12 +00:00
Shunkai Yao
9d6d93f163
Merge "Update comment about headTrackingSensorId" into main am: 42876b8011 am: 04a73fca69 am: 0432cf90ee
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2896201
Change-Id: I81af62d38e03be4bafcad7bef7c4bb45154df065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-03 23:02:55 +00:00
Treehugger Robot
823f5d44b7
Merge "Audio Effect VTS: run Dowmmix data path test only after HAL version 2" into main am: 8c00013594 am: 76268cc57d am: e1fced6967
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2894923
Change-Id: I5ab34e02e0113d34b7051b5be6e8177b10ec993d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-03 21:42:33 +00:00
Shunkai Yao
d090afe1af
Update comment about headTrackingSensorId
...
Bug: 317405349
Test: m, aidl-format
Change-Id: I5f4b0e931c073d87b1a30a55c39e614d24a63030
2024-01-03 19:50:15 +00:00
Mikhail Naganov
878afae8f8
audio: Fix the type used for timekeeping
...
On 32-bit builds, the 'long' type is 32 bit. Thus, it can not
be used to store the value returned from 'uptimeNanos'.
Bug: 318055805
Test: atest CtsMediaAudioTestCases
Change-Id: I4abf72415b7241728d3ddb1d11043dfd59a8d08a
2024-01-03 11:27:31 -08:00
Shunkai Yao
6b7784edfe
Audio Effect VTS: run Dowmmix data path test only after HAL version 2
...
Bug: 315074570
Test: VtsHalDownmixTargetTest
Change-Id: Iaa17519521f136901ec217f7d5b5fd0d03889533
2024-01-03 18:46:00 +00:00
Mikhail Naganov
ed2e67a0d7
Merge changes from topic "cuttlefish_aidl_audio-3" into main am: 5f50cd6320 am: 663f355b7a am: 9edfcbea4a
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2889786
Change-Id: I022f37428bc188fdfa07647bd9e9b8a753f31d72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-29 00:34:07 +00:00
Mikhail Naganov
a392968d37
audio: Add test configs for effects VTS tests am: b80de7bcd7 am: ca98d3982f am: 085ccd9f91
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2890072
Change-Id: I0e497aa1d407b745616658d073a0a2dd0d1a0a24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-29 00:34:02 +00:00
Mikhail Naganov
b80de7bcd7
audio: Add test configs for effects VTS tests
...
The main purpose of the config is to shut down the framework
audioserver while the VTS test is running. This is achieved by
setting 'vts.native_server.on' to '1'. Without this, restarts
of the effects HAL process which are a normal part of tests
affect the audioserver and may lead to failures of framework
tests that run interleaved with these VTS tests.
Bug: 264712385
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts
Change-Id: I2515cb62e46ef8e93cbddb2c0219f4523d2ecda5
2023-12-27 15:54:30 -08:00
Mikhail Naganov
27719f12e8
Revert "Add remote submix direct paths"
...
This reverts commit ce9767a966 .
Please see the comment on aosp/2832731. This configuration
leads to anomalous framework behavior.
Bug: 311830316
Test: atest audiorouting_tests
Change-Id: I5be3ac18819e297aa199c5a0f5d2e85758448b4b
2023-12-27 15:54:30 -08:00
Mikhail Naganov
e6612a500c
Merge changes from topic "fix-aidl-mix-ports-and-bt" into main am: eafa78c929 am: 002c58fafd am: 78d8c4dd50
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2877679
Change-Id: I0e0869b0ad13637ee5c53a865a7a34ea13f5560d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-27 05:09:31 +00:00
Mikhail Naganov
d1e45d1bf5
audio r_submix: Suggest configuration from the peer am: 3b732895a8 am: de6a93d47d am: f48e129f55
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886671
Change-Id: Icda9e4ef2cdd124e67222bf3401f722770a1179e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-27 05:09:26 +00:00
Mikhail Naganov
67bc25ca14
audio: Refactor configuration population am: a92039ac48 am: 8cb953b071 am: a667344e8c
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886670
Change-Id: Idf16a09027b4fb61d71c6f23cc620edf8264a1dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-27 05:09:21 +00:00
Mikhail Naganov
de6a93d47d
audio r_submix: Suggest configuration from the peer am: 3b732895a8
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886671
Change-Id: I6f7aecbe65da1a4ea555e812c640a2b3b43f7fff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-27 04:05:12 +00:00
Mikhail Naganov
8cb953b071
audio: Refactor configuration population am: a92039ac48
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2886670
Change-Id: I3594561197a36aa377816458ab1a324ee61410da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-27 04:05:07 +00:00
Mikhail Naganov
eafa78c929
Merge changes from topic "fix-aidl-mix-ports-and-bt" into main
...
* changes:
audio: Fix BT AIDL HAL module implementation
audio r_submix: Suggest configuration from the peer
audio: Refactor configuration population
2023-12-27 03:42:02 +00:00
Mikhail Naganov
a88cf60b87
audio: Fix BT AIDL HAL module implementation
...
In order to align with legacy behavior, when opening a stream,
the module must suggest the current configuration of the BT session.
For that to work, the BT device proxy must be opened prior
to creating a stream, code moved to ModuleBluetooth.
Fix minor inconsistencies and bugs found during testing.
Bug: 301213930
Bug: 316027906
Test: atest pts-bot
Change-Id: I04ddaf73be82f872a3f32a789563c3cbd648eb61
2023-12-26 16:34:58 -08:00
Mikhail Naganov
3b732895a8
audio r_submix: Suggest configuration from the peer
...
When there is a pipe established for a remote submix
device, suggest the configuration of the peer when opening
the other end.
Refactor SubmixRoute management to move it out from
StreamRemoteSubmix so that ModuleRemoteSubmix could also
use it.
Bug: 294962274
Test: atest audiorouting_tests
Change-Id: Ib31a662e7b65b92c614dc441a01160cae3485f3a
2023-12-26 10:31:43 -08:00
Treehugger Robot
ca7cb762b4
Merge "AHAL: update doc for prepareToDisconnectExternalDevice." into main am: f1db884971 am: ddb1c493f9 am: 2eb60daf1d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2889309
Change-Id: Idff2e5048f1f9857aa024d8edcba4b43bae6ca09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-22 01:50:20 +00:00
jiabin
d470926597
AHAL: update doc for prepareToDisconnectExternalDevice.
...
Bug: 317405349
Test: make
Change-Id: If6c61a851c2e565ab16eb738b9dc0d42ebc04b05
2023-12-21 23:20:56 +00:00
Mikhail Naganov
a92039ac48
audio: Refactor configuration population
...
In 'Module::setAudioPortConfig' allow subclasses to provide
their own suggested configuration.
In 'Module::populateConnectedDevicePort' provide the ID of
the device port instance that will be created as a result
of connecting an external device.
Also, expose 'ModuleDebug' flags to subclasses so that they
can know when device connections are simulated.
Bug: 264712385
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Iceb2bdeb61c3470554b592fe197efa54d3b9e578
2023-12-20 14:31:47 -08:00
Shunkai Yao
af93095530
Merge changes from topic "effect_ dependencies" into main am: 996e1ad8b7 am: 77af530748 am: ecfc88acec
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2875179
Change-Id: I06613c327736afcd090380682ab89336344125bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-19 23:12:46 +00:00
Shunkai Yao
34d18b2895
Update VTS header includes am: 1283685b4f am: 56527a5cdd am: ae22828ac5
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2871438
Change-Id: Ia55ddf658434d93f88e0ba1c0442a9bc224f3359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-19 23:12:42 +00:00
Shunkai Yao
341962478f
Merge "Spatializer default implementatoin with VTS" into main am: 6eea2ff346 am: a0d4f148a8 am: 255e0fc7b5
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2871083
Change-Id: I50f209b185870826fb88c59ac5d013edbd7f95f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-19 02:13:24 +00:00
Shunkai Yao
52da94e290
Effect AIDL: cleanup dependencies
...
Bug: 316236907
Test: Enable AIDL and build
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts
Change-Id: Id1e28b5852a1a8c154f31f4918326de7df8bfc54
2023-12-19 00:37:36 +00:00
Shunkai Yao
1283685b4f
Update VTS header includes
...
Bug: 273373363
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts
Change-Id: I2ad63f91b013db1ce2d3891216f1bd74606139c8
2023-12-19 00:36:49 +00:00
Shunkai Yao
f60fc373d9
Spatializer default implementatoin with VTS
...
Bug: 273373363
Test: atest VtsHalSpatializerTargetTest
Test: atest VtsHalAudioEffectTargetTest
Change-Id: I41218661ac7265723258303438dd01f704838188
2023-12-18 16:36:59 +00:00
Mikhail Naganov
5fb1adf965
Merge "Add remote submix direct paths" into main am: 177b9f71bd am: 8cba6a57f7 am: 469c7d43f7
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2832731
Change-Id: Iabcd5e6a68f64549bb754ea4d8f3a09af96f7789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-15 00:45:32 +00:00
Dean Wheatley
ce9767a966
Add remote submix direct paths
...
Explicitly reject remote submix non PCM input or output streams.
Bug: 311830316
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I3da9282d0f4ecb91dea65f784294e94436765538
2023-12-14 16:06:40 +11:00
Mikhail Naganov
6f69fb3608
Merge "audio: Fix remote submix behavior with multiple inputs" into main am: fb29f53f53 am: 06fef676a6 am: 6603708d1e
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2871775
Change-Id: I5b12d76acfd7229554c730b0526685022688276d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-13 19:32:38 +00:00
Treehugger Robot
0d3349c717
Merge "AHAL: add API to notify the HAL module about disconnecting device." into main
2023-12-13 18:40:21 +00:00
Mikhail Naganov
fb29f53f53
Merge "audio: Fix remote submix behavior with multiple inputs" into main
2023-12-13 17:45:13 +00:00
Treehugger Robot
e91038dfc4
Merge "Audio AIDL : Pick PreProcessing library for 2 audio effects" into main am: 71f56141e7 am: d02973eac8 am: 56df6b5fa0
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2870276
Change-Id: Iffa33b0a642d62d1d1a0cbebc1ea3320b1b4c237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-13 08:44:13 +00:00
jiabin
dd23b0e58e
AHAL: add API to notify the HAL module about disconnecting device.
...
When external device is about to disconnect, the audio framework will
notify the HAL module about the coming device disconnection so that the
HAL module could abort any active read/write operations on drivers to
avoid problems with the HW interfaces.
Bug: 279824103
Test: atest VtsHalAudioCoreModuleTargetTest
Change-Id: I9f960b8ae5df11a764e70bd63f98c0f8b8386c34
Merged-In: I9f960b8ae5df11a764e70bd63f98c0f8b8386c34
2023-12-13 01:02:21 +00:00
Mikhail Naganov
7b234d483f
audio: Fix remote submix behavior with multiple inputs
...
Align the behavior of the new implementation with the legacy
implementation in the case when the client opens multiple
input streams on the same remote submix device.
Reduce the HAL buffer size to match legacy behavior.
Bug: 264712385
Test: atest CtsVirtualDevicesTestCases --test-filter=".*VirtualAudioTest.*"
(cherry picked from commit a83c8a5518 )
Change-Id: I6f5e6a2c133059c66269b1bdd8a30392db282c4d
2023-12-12 15:55:22 -08:00
Shunkai Yao
829179e29c
Merge "Revert "audio: Fix remote submix behavior with multiple inputs"" into main
2023-12-12 23:20:48 +00:00
Shunkai Yao
0347f0eff0
Revert "audio: Fix remote submix behavior with multiple inputs"
...
Revert submission 2862771-cuttlefish_aidl_audio-2
Reason for revert: b/316027906
Reverted changes: /q/submissionid:2862771-cuttlefish_aidl_audio-2
Change-Id: I68932be8dad4b4fd4214d0ae6fc01202727f1658
2023-12-12 22:55:59 +00:00
Mikhail Naganov
79f7fd088d
Merge "audio: Fix remote submix behavior with multiple inputs" into main
2023-12-12 21:11:55 +00:00
jiabin
bc79ff19e8
AHAL: add API to notify the HAL module about disconnecting device.
...
When external device is about to disconnect, the audio framework will
notify the HAL module about the coming device disconnection so that the
HAL module could abort any active read/write operations on drivers to
avoid problems with the HW interfaces.
Bug: 279824103
Test: atest VtsHalAudioCoreModuleTargetTest
Change-Id: I9f960b8ae5df11a764e70bd63f98c0f8b8386c34
2023-12-12 17:44:28 +00:00
Sneha Patil
71b814c4b7
Audio AIDL : Pick PreProcessing library for 2 audio effects
...
Bug: 305866207
Test: atest VtsHalAECTargetTest
Test: atest VtsHalNSTargetTest
Change-Id: I4fcd95abe6834dec13e570ad2ecb5cd4f1bdc1d3
2023-12-12 17:51:00 +05:30
Mikhail Naganov
a83c8a5518
audio: Fix remote submix behavior with multiple inputs
...
Align the behavior of the new implementation with the legacy
implementation in the case when the client opens multiple
input streams on the same remote submix device.
Reduce the HAL buffer size to match legacy behavior.
Bug: 264712385
Test: atest CtsVirtualDevicesTestCases --test-filter=".*VirtualAudioTest.*"
Change-Id: Ia86a8480495693595dbb501ec58e5d1d238abab2
2023-12-08 09:37:41 -08:00
Yi Kong
62b951e58b
Fix -Wunused-variable compiler warning am: 810d41a774 am: 4eeda91a4a am: 76705af803
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2861356
Change-Id: I00242599f1a67f59a8e2f415ffa52231d54007dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-06 13:50:56 +00:00
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
bffdaa9d19
Merge "DownmixProcess: Add tests to validate the downmix process." into main am: ab269e2fc7 am: 947f4f776c am: 149564ad7e
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2849236
Change-Id: I34f8bdbee50ae15145272544c5546f3ab6aaef15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-06 02:51:32 +00:00