Commit Graph

1500 Commits

Author SHA1 Message Date
TreeHugger Robot
7382601be8 Merge changes from topic "aidl_audio_effect_2"
* changes:
  AIDL effect: Initial IEffect interface implementationi and vts test
  AIDL effect: Initial IEffect interface definition
2022-09-19 21:07:15 +00:00
Treehugger Robot
f516daae75 Merge "audio: Refactor transaction status checks in VTS" am: 857e3d98d8 am: 391bc4c9aa am: 8de860c56d am: 4b62c5c0b1 am: 17d3fd165d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2215767

Change-Id: I34aba4fe1e7eff5b123f1285f61e1bd66ffd5ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 04:54:48 +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
36117a1587 Merge "audio: Cleanups and refactorings" am: e503e08107 am: ba476fa7b3 am: d2575f7332 am: 89dce2f2ea am: 546ce87c95
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2216142

Change-Id: Icc2ae59a621dcda64d2159ba945cee20a08e5259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 20:45:32 +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
Shunkai Yao
e4bab46e14 AIDL effect: Initial IEffect interface implementationi and vts test
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest
Change-Id: Id64d28af9122e82acd96e3349cf37c3d9728069a
2022-09-06 21:32:00 +00:00
Shunkai Yao
ca9a1f53f8 AIDL effect: Initial IEffect interface definition
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest
Change-Id: I0d02fed5d40a108003e735d3619e2fc7c0ef6332
2022-09-05 05:03:44 +00:00
Mikhail Naganov
951ad0e1f6 audio: Add checks to effects feature configs retrieval am: 8e3480edfe am: b5a665a326
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19806116

Change-Id: I0fd3688038a23a73d8f97417a174b0cfb25097bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 22:46:51 +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
Shunkai Yao
acfc7ae9cb AIDL effect: Extract common parts of effect service into cc_defaults am: 43f9a07e04
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198794

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

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

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

Change-Id: Iba9355ce9775d8f8bd8213d11bd31070209c2e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 19:57:21 +00:00
Mikhail Naganov
8e3480edfe audio: Add checks to effects feature configs retrieval
The size of the feature config needs to be limited
by the Binder transaction size. This check is enforced
before calling into legacy C API.

Also, fixed invalid calculation of buffer size
in Effect::getSupportedConfigsImpl.

Bug: 240266798
Test: atest VtsHalAudioEffectV7_0TargetTest
Change-Id: I1a1f7931a07e28642967fa68d9a358429138db29
2022-09-01 00:35:52 +00:00
Shunkai Yao
43f9a07e04 AIDL effect: Extract common parts of effect service into cc_defaults
Bug: b/238913361
Test: atest VtsHalAudioEffectTargetTest
Merged-In: I58d925b3f4a3d41d4014f54f78d95c26cc5520ea
Change-Id: I58d925b3f4a3d41d4014f54f78d95c26cc5520ea
(cherry picked from commit c8ed5c27a1)
2022-08-30 22:34:04 +00:00
Shunkai Yao
67b1be60ab AIDL effect: Add vts for the initial effect AIDL interface implementation
Tests basic binder calls of IFactory.

Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest
Merged-In: If5db3cae0447f41a149a60505d208070fbfedb7f
Change-Id: If5db3cae0447f41a149a60505d208070fbfedb7f
(cherry picked from commit 1f19c23ab6)
2022-08-30 22:13:17 +00:00
Shunkai Yao
c23916b96f AIDL effect: Minimal example implementation
Add effect factory placeholder implementation.
Update android.hardware.audio.service-aidl.example to include effects.

Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest

Merged-In: I88266b509a03ee336e22be460580c5b22123659e
Change-Id: I88266b509a03ee336e22be460580c5b22123659e
(cherry picked from commit 8a0ae5430f)
2022-08-30 22:11:16 +00:00
Shunkai Yao
f1d6039f96 AIDL effect: Initial IFactory interface definition
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest

Merged-In: I9f5ef1284bb5d77a9d60cb8b901742fc8e467926
Change-Id: I9f5ef1284bb5d77a9d60cb8b901742fc8e467926
(cherry picked from commit d56bc22d1e)
2022-08-30 22:09:18 +00:00
Mikhail Naganov
fda70a6411 audio: Add StreamDescriptor.frameSizeBytes am: a2c714129e am: c8df971609 am: e579d10f70 am: af8ca6aedd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199852

Change-Id: I7b3d3db9a3eea7611419a2c15c00de1c959de57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 18:47:08 +00:00
Mikhail Naganov
ee603672d8 audio: Implementation of audio I/O, part II am: 4f5d3f12f5 am: 4af7cb62b4 am: 43f77e934b am: 6726857711
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199346

Change-Id: I6395641a8a121f6042b11d16765c1582f53fdd25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 18:47:06 +00:00
Mikhail Naganov
c2d3baaf50 audio: Fix the lifetime of the StreamWorker's logic part am: 0b9c5feed1 am: 4b279d6a32 am: 231ca12ce8 am: 63989892e3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199345

Change-Id: I90e8237e5427fd114a4c661437971906cff0219d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 18:47:03 +00:00
Mikhail Naganov
431bb8d692 audio: Allow stopping a StreamWorker from the looping thread am: 48d3115614 am: 33b5a6d8b4 am: 8883713e20 am: 783ebc4737
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199344

Change-Id: Iab987590a96c09d98d0bffe714c6d0f8f0032b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 18:47:00 +00:00
Mikhail Naganov
e579d10f70 audio: Add StreamDescriptor.frameSizeBytes am: a2c714129e am: c8df971609
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199852

Change-Id: I0f8f5a323b45a6ae287cc702d0be418d8f882977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 17:54:18 +00:00
Mikhail Naganov
43f77e934b audio: Implementation of audio I/O, part II am: 4f5d3f12f5 am: 4af7cb62b4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199346

Change-Id: Id7d990b633efff99525d04cd3581f40083025ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 17:54:16 +00:00
Mikhail Naganov
231ca12ce8 audio: Fix the lifetime of the StreamWorker's logic part am: 0b9c5feed1 am: 4b279d6a32
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199345

Change-Id: I1492567a602981f87ea703fba38ce7b1cd68a524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 17:54:14 +00:00
Mikhail Naganov
8883713e20 audio: Allow stopping a StreamWorker from the looping thread am: 48d3115614 am: 33b5a6d8b4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199344

Change-Id: Ie6ccc3aa54a7614184784b3433d7e1c4044d7115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 17:54:12 +00:00
Mikhail Naganov
c8df971609 audio: Add StreamDescriptor.frameSizeBytes am: a2c714129e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199852

Change-Id: Ifc2501a7e00e356a83b8f1900df1c6d11ce40106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 17:25:07 +00:00