Commit Graph

2311 Commits

Author SHA1 Message Date
Treehugger Robot
bcdc82db37 Merge "Remove the limitation of max open streams" into main am: 4115d8b01d am: fcc06a7f6c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2719933

Change-Id: Ib5bf4303c23b8383f86a6d12a4734adf74d1be8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 19:34:23 +00:00
Treehugger Robot
4115d8b01d Merge "Remove the limitation of max open streams" into main 2023-08-24 19:29:36 +00:00
Shunkai Yao
2461891a1c Remove the limitation of max open streams
Bug: 295055755
Test: atest CtsMediaAudioTestCases
Change-Id: Ifc0bec23ccc2845657389783194eb18fcc7884fa
2023-08-24 18:14:03 +00:00
Treehugger Robot
f5c1a00e5f Merge "Migrate String8|16.setTo to assignment operator" into main am: 16012b6b06 am: ffca721517
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2723937

Change-Id: Ifc1e9287d8ef393972bfc0b4749736566d19e4a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 17:26:49 +00:00
Treehugger Robot
16012b6b06 Merge "Migrate String8|16.setTo to assignment operator" into main 2023-08-24 15:54:28 +00:00
Treehugger Robot
c38a04ba41 Merge "audio: Make IConfig.getSurroundSound default implementation more robust" into main am: 58d953e4be am: cc476475f8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2723318

Change-Id: I46ec3693bdfe5160598488c43bba16dc6b04f433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 23:52:47 +00:00
Treehugger Robot
58d953e4be Merge "audio: Make IConfig.getSurroundSound default implementation more robust" into main 2023-08-23 22:31:08 +00:00
Tomasz Wasilczyk
17034e5f39 Migrate String8|16.setTo to assignment operator
Bug: 295394788
Test: make checkbuild
Change-Id: Ic98514f48399115046029e68883408090f0cd0db
2023-08-23 22:14:17 +00:00
Treehugger Robot
812b6651e5 Merge "Use String8/16 c_str [audio]" into main am: ff0aae4132 am: 74388d64a3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2723315

Change-Id: I43ab1717c9639fa0ac84b8cec191ecd53c0f3ab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 21:54:23 +00:00
Mikhail Naganov
1e25ef808f audio: Make IConfig.getSurroundSound default implementation more robust
In the case when there is a problem with the legacy APM XML file,
the converter provides a default surround sound config. However,
the default implementation of IConfig::getSurroundSoundConfig did
not take an advantage of that, and was returning an empty config,
which is not accepted by VTS.

Also, improve logging messages: clarify the situation when no readable
audio policy XML file found, and use outer functions name for lambdas.

Bug: 293978054
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Iae069a0498009605ef5ededb9c9112efab08548a
2023-08-23 14:18:27 -07:00
Treehugger Robot
ff0aae4132 Merge "Use String8/16 c_str [audio]" into main 2023-08-23 20:46:44 +00:00
Tomasz Wasilczyk
b20afc5f87 Use String8/16 c_str [audio]
Bug: 295394788
Test: make checkbuild
Change-Id: I9cba2d925dc1e5363927ba336b0ca2c43207ddad
2023-08-23 18:45:04 +00:00
Shunkai Yao
1a13c459e7 Merge "Update vts to align AOSP effects support requirement with CDD" into main am: d3e5e33330 am: ca273f4e33
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2719855

Change-Id: I36be7a65e6f5ddea89abf36a1e1238dbe07189d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 16:43:00 +00:00
Shunkai Yao
d3e5e33330 Merge "Update vts to align AOSP effects support requirement with CDD" into main 2023-08-23 15:34:13 +00:00
Shunkai Yao
9696741d0c Update vts to align AOSP effects support requirement with CDD
Bug: 296790934
Test: atest VtsHalAudioEffectFactoryTargetTest
Change-Id: I1c837125e62a083d95e279ed0584a9bccea3dcbd
2023-08-23 15:33:51 +00:00
Treehugger Robot
1b44653d3b Merge "r_submix: keep the signed value for offset calculation in AIDL implementation" into main am: bc2537e41f am: 2f8e3077fe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2721915

Change-Id: I651a51da983a3608a3ae0843c893ff3b879247e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 02:13:06 +00:00
Shunkai Yao
7816f26afa r_submix: keep the signed value for offset calculation in AIDL implementation
otherwise a negative offset will result in long sleep

Bug: 295055755
Test: atest android.media.audio.cts.AudioPlaybackCaptureTest
Change-Id: Ie941cc2525e3ea42b53106ae3a65242794b1dd1b
2023-08-22 20:50:31 +00:00
Treehugger Robot
ed49e9068b Merge "audio: Fix remote submix module device ports handling" into main am: 7f2619ddff am: b1a26c5fa6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2703156

Change-Id: I76e24d76665c1e3909e1f38ea6e4d658145f7afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-19 05:05:09 +00:00
Treehugger Robot
7f2619ddff Merge "audio: Fix remote submix module device ports handling" into main 2023-08-19 03:53:26 +00:00
Tomasz Wasilczyk
396ccf817c Don't use String8::empty am: fed7d54dfc am: 8be4b41fd7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2707753

Change-Id: I9a1deba9b659ffdd875976f5e6f748fa0816de5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 18:32:17 +00:00
Tomasz Wasilczyk
fed7d54dfc Don't use String8::empty
With the current definition, it's an alias of default constructor. This
has very different meaning from std::string empty, especially that
static method String8::empty can still be called from instance context.

One of such bugs are present in in ParametersUtil.

Bug: 295394788
Test: make checkbuild
Change-Id: I9116a0c42a6a9e94116eaaaa0fd60568db428838
2023-08-17 13:53:55 +00:00
David Li
b089c0cfee audio: Fix remote submix module device ports handling
- remove the default address "0" for IN_SUBMIX and OUT_SUBMIX;
 - remove the profiles in the device port and assign profiles when
   connecting;
 - make remote submix input to use "virtual" connection type,
   same as the output;
 - fix ModuleConfig in VTS to avoid returning devices with virtual
   connections as "external devices" because they can actually
   be connected even when connection simulation is disabled;
 - fix TryConnectMissingDevice VTS test to disconnect the device
   if the operation has unexpectedly succeeded.

Bug: 286914845
Bug: 294976817
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Ife11c9c356d1b5dc587d08cef47294e3b29f65c5
2023-08-10 14:37:31 -07:00
Treehugger Robot
e0612ac03e Merge "audio: Implement the major functionality of the primary CF HAL" into main am: ff1f1f3494 am: a9d915c5a7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2695367

Change-Id: I83eab84203e2133b83608e8079a65a56087d5815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 09:21:41 +00:00
Treehugger Robot
ff1f1f3494 Merge "audio: Implement the major functionality of the primary CF HAL" into main 2023-08-08 07:56:05 +00:00
Treehugger Robot
745d16098f Merge "audio: Ensure proper priority and scheduler for service threads" into main am: 41243dc213 am: 67869eb176
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2696137

Change-Id: I959a56824684cef008fee0bb265f5755f0cb430b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 03:49:58 +00:00
Mikhail Naganov
4bf6899cc7 audio: Ensure proper priority and scheduler for service threads
Change audio worker threads priority to ..._URGENT_AUDIO to match
the coupled thread in the audio flinger.

Set SCHED_FIFO scheduler for FAST threads (also to match AF fast
mixer/capture threads). In order to enable that, grand SYS_NICE
capability to the HAL service process and provide "getTid"
function in the StreamWorker class. For testing, add a "FAST"
output to the "stub" module in the HAL configuration.

Bug: 286914845
Test: atest libaudioaidlcommon_test
Test: atest VtsHalAudioCoreTargetTest
Test: adb shell ps -A -T -o PID,TID,NI,PCY,PRI,RTPRIO,SCHED,CMD
      for the HAL service process during VTS test. For regular
      "reader"/"writer" threads should see 'NI 19, PRI 38',
      for FAST "writer" should see 'NI -19, PRI 43, RTPRIO 3, SCH 1'
Change-Id: Iab7e21ebc139ff11cf9b7f4a1645960db8dadd43
2023-08-07 18:15:19 -07:00
Mikhail Naganov
cf824f65c8 audio: Implement the major functionality of the primary CF HAL
Core HAL changes:

1. Add StreamPrimary implemented via StreamAlsa.

2. Align the configuration with the HIDL HAL.

3. Fix position retrieval vs. standby call.

4. Fix sleeps in StreamAlsa.

VTS changes:

1. Use several bursts for stream I/O test scenarios that check
   observable position increase. This is because the position may
   not be available until a couple of transfers have been made.

2. Do not require position increase for the scenarios that do
   not make several bursts. As specified above, the position may
   not have been increased for the ALSA case. Whereas, using
   multiple bursts in all scenarios will increase test time, and
   make the state machine transitions graph more complicated.

3. Hook up the test config file to shut down audioserver during
   VTS tests, fix the test config file.

Bug: 286914845
Test: atest VtsHalAudioCoreTargetTest
Test: compare APM dumps for AIDL vs. HIDL
Change-Id: I85271564c664fa40008d60e82b32eaa66a99c68f
2023-08-07 13:38:50 -07:00
Treehugger Robot
ba5b434808 Merge "audio: Make renamings suggested by reviewers" into main am: e8d695d9b2 am: d621a32f12
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2693226

Change-Id: I5791383f801a2b014b6433810eae132e11201010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 17:15:40 +00:00
Mikhail Naganov
459b7331e9 audio: Make renamings suggested by reviewers
Rename DriverInterface::getPosition -> refinePosition. This reflects
the fact that the driver may provide more precise position, however
this is an optional operation.

Rename StreamIn/Out::mContext -> mContextInstance. This is
to emphasize that StreamIn/Out actually own the context and they
hold the real context instance, not just a reference/pointer
to it, like other classes involved in the inheritance chain.

Bug: 286914845
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Id7159f9bf3ee020dc7cf594ec35f5d59d23d7e31
2023-08-03 10:31:12 -07:00
Mikhail Naganov
ca31f56bca Merge "audio: Address comments from an internal review" into main am: 09d45c473e am: 581cd68e17
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2691166

Change-Id: I99289412fec3846d198483bfcd6bfd4c05fc9a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 17:28:59 +00:00
Mikhail Naganov
09d45c473e Merge "audio: Address comments from an internal review" into main 2023-08-03 15:58:56 +00:00
Treehugger Robot
731058e036 Merge "Audio r_submix : Handle the usecase when no data is available to read." into main am: 0bc307a5dd am: 830e95f8dd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2686486

Change-Id: I416ac9712401cf403bd4698d5a34c646945bdc01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 20:28:53 +00:00
Mikhail Naganov
0faf339425 audio: Address comments from an internal review
Bug: 286914845
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I2f636c77f67fdd8eeac70dd304848bf7f76db4e5
2023-08-02 12:24:47 -07:00
Treehugger Robot
0bc307a5dd Merge "Audio r_submix : Handle the usecase when no data is available to read." into main 2023-08-02 18:51:53 +00:00
Treehugger Robot
178734d7ec Merge changes from topic "bluetoothmodule" into main am: 169be3476d am: d505445445
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2640450

Change-Id: I8dead7aba1537f0cc2f4920939fd44bcf3629a27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 18:40:51 +00:00
Mikhail Naganov
b9b937cce7 aosp aidl bluetooth audio hal implementation am: b03b5c4a06 am: 412aafd1eb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2624193

Change-Id: I1ef6b0bed47715b290487d46dcb5adc7d7899a45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 18:40:45 +00:00
François Gaffie
9f063339aa Audio: add system usage to audio policy engine schemas am: acd4a677f0 am: 2b10decfc0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2689186

Change-Id: I376b0c6278a1551cb1e2d753d40e79b1b1c1d2ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 18:39:53 +00:00
Mikhail Naganov
412aafd1eb aosp aidl bluetooth audio hal implementation am: b03b5c4a06
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2624193

Change-Id: Ic1acd04cc6c73a96b40329524e45740f8660efbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 18:01:55 +00:00
Treehugger Robot
169be3476d Merge changes from topic "bluetoothmodule" into main
* changes:
  aosp aidl bluetooth parameter support
  aosp aidl bluetooth audio hal implementation
2023-08-02 17:41:07 +00:00
Mikhail Naganov
b03b5c4a06 aosp aidl bluetooth audio hal implementation
Bug: 228804498
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Id5fb60fe53ead9f5d2e6ecbb9988a23835cf2509
2023-08-02 21:42:01 +05:30
Ram Mohan
18f0d5121a aosp aidl bluetooth parameter support
Bug: 228804498
Test: atest VtsHalAudioCoreTargetTest
Change-Id: If1820018d5a6750eed0d0b486e15fc7c717aa11c
2023-08-02 21:42:01 +05:30
François Gaffie
acd4a677f0 Audio: add system usage to audio policy engine schemas
Bug: 293917986
Test: m

Change-Id: I49a8d3cfeb45eddc95ad6ab4a33b0adf0585cde2
Signed-off-by: François Gaffie <francois.gaffie@renault.com>
2023-08-02 10:47:00 +02:00
Shraddha Basantwani
675cce24d6 Audio r_submix : Handle the usecase when no data is available to read.
Bug: 290116295
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Ifd6706d593f890dd8ae148523a37177774c8ffd4
2023-08-02 05:19:24 +00:00
Shraddha Basantwani
75417bfe60 Audio r_submix : Replace usage of portId by device address am: 2e460345a2 am: 335037031d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2677975

Change-Id: I6f8c04d746cc48859092a5fb7dc12943e8374ddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 18:02:09 +00:00
Shraddha Basantwani
e54466ff88 Audio : Fix a few minor issues with stream switcher class am: 035beba203 am: f901f6a465
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2680756

Change-Id: Idf6d4682688311952a4a04019e971f80595f0e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 18:01:05 +00:00
Shraddha Basantwani
2e460345a2 Audio r_submix : Replace usage of portId by device address
Use stream switcher to obtain device address for creation
of a remote submix stream.

Bug: 286914845
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I8dde3d59e488c9621dce78ffd5249254ecfc0b1a
2023-08-01 12:06:38 +00:00
Shraddha Basantwani
035beba203 Audio : Fix a few minor issues with stream switcher class
1. Constructor should forward variable arguments
2. mContext initialization was missing
3. Add nullptr check for addEffect and removeEffect methods

Bug: 264712385
Bug: 286914845
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I4037292bf497be186b26508bd16846886fa4fe55
2023-08-01 12:06:20 +00:00
Mikhail Naganov
0b1e574946 audio: Add a helper class to simplify legacy HALs migration am: 43a85cfb2b am: 24d182487c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2674340

Change-Id: I738766e76dbcb954f346b8f989eba2b7bf330ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 19:12:06 +00:00
Mikhail Naganov
0935dc482e audio: Move frame counter to StreamContext am: 1eedc130e8 am: 3b553744e5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2674339

Change-Id: Ib8fa736b81ba2cc14f7e2f57921d646830c1778a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 19:12:02 +00:00
Mikhail Naganov
1a1a6731a8 audio: Update ChildInterface to set scheduler policy lazily am: 780fefb331 am: e35c2c8368
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2674338

Change-Id: Ia3d33ab611d4fb766450a5070f6888f6fd127e28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 19:11:56 +00:00