Commit Graph

34 Commits

Author SHA1 Message Date
someone5678
2e0ad1d9fa interfaces: bluetooth: Restore LC3 codec support for A2DP
* LC3 codec support removed in commit "Add Opus to BT Audio HAL and update version to V2"
* Add back support for it to properly handle the case
  that device only supports LC3 and etc. but not OPUS.

Ref:
a2587da5b2

Change-Id: If779b175c95698b096cc38ece54cddd659b338f7
Signed-off-by: someone5678 <someone5678@users.noreply.github.com>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
2025-06-09 10:00:56 +09:00
Michael Bestas
5143e92494 Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6
Android 15.0.0 Release 6 (AP4A.241205.013)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssgAKCRDorT+BmrEO
# eAQDAJ0Y9tLkI/9E6JFvvf9DIGZxnCabgQCghIthWz3dPjsuoGGuJCLjmZMbBXs=
# =kzIy
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:02 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2468 signatures in the past
#      3 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Yu Shan (18) and others
# Via Automerger Merge Worker (504) and others
* tag 'android-15.0.0_r6': (241 commits)
  [RESTRICT AUTOMERGE] HapticGenerator VTS: validate parameter before setting
  Inject getS2rS2dConfig through constructor.
  Use static libjsoncpp for unit tests.
  audio: Update FMQ error reporting handler
  Face VHAL for user build
  VtsHalBluetoothTargetTest: Check API level compatibility
  Align EffectContext workbuffer size to FMQ size
  Add RSN overriding feature flag
  wifi: Update Supplicant HAL to V4
  Replace "UDS_Public" with "UDS_Pub" for consistency
  Mark vhal property protos library to be available in any APEX
  VisualizerTest: Add tests for visualizer effect parameters
  Change documentation for AP_POWER_STATE_REQ
  Add frozen field to vibrator
  Nfc AIdl interface updated following
  Camera: Remove flag manual_flash_strength_control
  Do not force verbose logs on for anything including ComposerCommandBuffer.h
  Revert^2 "Support PER_DISPLAY_BRIGHTNESS."
  audio: Disable I/O tests for input MMap streams
  Enable Rust backend on Keymint, Fingerprint and Biometrics interfaces
  ...

Change-Id: I18ad17d1e07299d8fe23b8ce8b6b6bbee013765f
2024-12-10 17:46:03 +02:00
klozz
e4674c11e6 btaudio: aidl: add 16 bit sample rate for aptX offloading
For some reason soundpeats are asking for 16bit on aptX adaptive
and are crashing the whole audio sesion

Change-Id: I9f37838146b45a98e734bbc6939914d03ba3cf62
2024-09-09 03:02:05 +03:00
Adithya R
4f1d622aa6 btaudio: aidl: Support offloading all LDAC qualities
At least Qualcomm BT stack supports HW offload of all LDAC quality
configurations (low, medium, high and adaptive). Without this, it
reports invalid codec configuration and breaks the audio session.

10-21 12:24:25.649   880   903 W BTAudioCodecsAidl: IsOffloadLdacConfigurationValid: Unsupported CodecSpecific=CodecSpecific{ldacConfig: LdacConfiguration{sampleRateHz: 96000, channelMode: STEREO, qualityIndex: ABR, bitsPerSample: 32}}
10-21 12:24:25.649   880   903 W BTAudioProviderA2dpHW: startSession - Invalid Audio Configuration=AudioConfiguration{a2dpConfig: CodecConfiguration{codecType: LDAC, encodedAudioBitrate: 0, peerMtu: 666, isScmstEnabled: false, config: CodecSpecific{ldacConfig: LdacConfiguration{sampleRateHz: 96000, channelMode: STEREO, qualityIndex: ABR, bitsPerSample: 32}}}}
10-21 12:24:25.649 21520 21549 E bt_stack: [ERROR:client_interface.cc(391)] StartSession: BluetoothAudioHal Error: Status(-3, EX_ILLEGAL_ARGUMENT): '', audioConfig=AudioConfiguration{a2dpConfig: CodecConfiguration{codecType: LDAC, encodedAudioBitrate: 0, peerMtu: 666, isScmstEnabled: false, config: CodecSpecific{ldacConfig: LdacConfiguration{sampleRateHz: 96000, channelMode: STEREO, qualityIndex: ABR, bitsPerSample: 32}}}}

Change-Id: I50f0aee3af70b15dbc73a4e4570353b0adcdfa27
2024-09-09 03:02:05 +03:00
Patrick Liao
c7f79e0450 Turn on 48kHz sampling rate in offload's AAC codec capability
Bug: 331941704
Flag: exempt, only turn on capability does not effect stack behavior
Test: m com.android.btservices
Test: atest VtsHalBluetoothAudioTargetTest
Change-Id: I36bf1e2183f237988cc77465a486e70b942409f5
2024-06-19 06:08:52 +00:00
Bao Do
2fa1ab4bd5 Template and schema of HFP provider info
Bug: 322280104
Test: make
Change-Id: Iac4f96db08b3b7fb2c5f0b080ba3e972e6020982
2024-02-22 13:49:35 +08:00
Jakub Tyszkowski
0259aafb71 Fix filling the configuration map
Bug: 319090769
Test: atest VtsHalBluetoothAudioTargetTest
Change-Id: I1806d8a20abb9a9756512ae8d433c6c6ff784159
2024-01-08 14:57:43 +00:00
Bao Do
fbc99e05c6 Template and schemas for parsing LE Audio Set Configuration.
Bug: 306225778
Test: mmm hardware/interfaces/bluetooth/audio/utils
Change-Id: I20482faf20a41f04c39e1314db45a07cb5f9956b
2023-12-13 07:38:34 +00:00
Bao Do
6aeb5d7217 Add LE Audio getProviderInfo information
Bug: 306225778
Test: mmm hardware/interfaces/bluetooth/audio/aidl/default
Change-Id: Ieb03a1a3096dbeb6a4e2ac4774ece6d3ef3e33be
2023-12-13 07:38:34 +00:00
Yuyang Huang
aa70c11126 Add HFP to BluetoothAudioSession
Test: m .
Bug: 265057196
Change-Id: I0e2e9d0f34ebf3f732c4f2da799c4c30f52bdeef
2023-12-07 05:54:59 +00:00
Alice Kuo
f850de6732 Move APTX_ADAPTIVE_LE and APTX_ADAPTVIE_LEX to configurable
We should bring the capabilities from the configure file that the device
could have its own capabilties.

Bug: 302173270
Test: atest VtsHalBluetoothAudioTargetTest
Change-Id: I2cb5194acbe64d7d64cca9b245b26ca5fbac35d4
2023-10-04 04:07:06 +08:00
Sagar Verma
62df910355 BT: AptxAdaptive LE/LEX codec and AAC ABR AIDL Changes
AptxAdaptive LE/LEX codec and AAC ABR AIDL side changes

Bug: 254567319
Tag: #feature
Test: m android.hardware.bluetooth.audio-freeze-api &&
      m android.hardware.bluetooth.audio-update-api &&
      atest VtsHalBluetoothAudioTargetTest
Change-Id: I74a2df64ba6ef2ae02e08850b0f6c7784b24b02b
2023-02-22 09:19:17 +05:30
shihchienc
d7f565a943 Add BluetoothLeAudioCodecsProvider Unit Test
Add unit test for BluetoothLeAudioCodecsProvider and simplify
the public interface of BluetoothLeAudioCodecsProvider class

Bug: 253569201
Test: atest VtsHalBluetoothAudioTargetTest
Test: atest BluetoothLeAudioCodecsProviderTest
Test: manual test
Change-Id: I064eb4058b129a571cf9dbb91b85bafe7236b735
2022-11-01 06:36:30 +00:00
shihchienc
8ed901a977 Expose different offload audio capabilities by project
The current LE audio offload capabilities is hardcode in the
Bluetooth audio HAL. It has the limitation that all the project
would expose the same capabilities. As the newer project comes,
if the ADSP or the controller could handle more configuration
with higher quality or higher bandwidth. It would impact older
project may not work on it. So we plan the feature to make the
le audio offload support to be more flexible.

Bug: 238983662
Test: 1. atest VtsHalBluetoothAudioTargetTest
      2. make sure offload capabilities can be supported with those
         devices having config XML file
Change-Id: Id82581fdcd22e38108f17c7942bca997b53bab35
2022-09-13 15:19:03 +00:00
Treehugger Robot
56ff7775f4 Merge "le_audio_offload: Support two sources for conversational" am: 5b4464928a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2058869

Change-Id: I997da918ceece45e17d1c607d4d15ca8a2ca9ca3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 03:01:20 +00:00
Treehugger Robot
5b4464928a Merge "le_audio_offload: Support two sources for conversational" 2022-08-09 02:42:58 +00:00
Patty
51f165b314 le_audio_offload: Support two sources for conversational
Tag: #feature
Bug: 241775706
Test: atest VtsHalBluetoothAudioTargetTest
Change-Id: I1bc59d09ec2ad3a8e65712c2fa099e806cce3c2d
2022-08-08 15:44:14 +00:00
Alice Kuo
fb6b495535 Bluetooth audio hal check broadcast configuraiton for the broadcast offload am: ee398a93f5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2147741

Change-Id: I913250b6070b9d16bd03669c7fe078ea6c5bcbab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 05:20:27 +00:00
Alice Kuo
ee398a93f5 Bluetooth audio hal check broadcast configuraiton for the broadcast offload
The patch contains the following changes
1. Check the broadcast audio configuration as starting broadcast offload
   session
2. Update audio configuration checker for broadcast offload
3. Remove the IsOffloadLeAudioConfigurationValid function that the audio
   configuraiton is invalid as session started, so we don't need to
   check it at that time

Bug: 210987580
Test: start the offload broadcast stream, and check the session status
Change-Id: I60b1b506051873f6d942f2febace6562634fc12a
2022-07-13 04:39:00 +00:00
Omer Osman
b229ac5fd1 Merge "Add Opus to BT Audio HAL and update version to V2" into tm-dev 2022-05-13 16:54:28 +00:00
Omer Osman
a2587da5b2 Add Opus to BT Audio HAL and update version to V2
This CL adds Opus as a supported A2DP codec to the BT Audio HAL and
updates HAL compatibility matrix.

Bug: 226441860
Test: A2DP sink device using bds-dev
Change-Id: I21249e3e7e76412af7ed62a3fc9ec133434cf963
2022-05-12 05:56:08 +00:00
Łukasz Rymanowski
4d14c1edba Add 32kHz as supported setting
Bug: 230550335
Test: Build, test audio
Change-Id: I94c4c54092d0afb71aee555fa46936e228397444
(cherry picked from commit 12f82bb40c)
Merged-In: I94c4c54092d0afb71aee555fa46936e228397444
2022-05-12 12:03:51 +08:00
Łukasz Rymanowski
12f82bb40c Add 32kHz as supported setting
Bug: 230550335
Test: Build, test audio
Change-Id: I94c4c54092d0afb71aee555fa46936e228397444
2022-05-06 17:17:04 +00:00
Patty Huang
bdf65ba94f Support 24k and 32k config for LE Audio Offload
Bug: 230402180
Test: Manual
Change-Id: If4931999009b27423adeab3af50238dd6d8c8637
(cherry picked from commit f4e3551eb1)
Merged-In: If4931999009b27423adeab3af50238dd6d8c8637
2022-05-04 17:31:51 +08:00
Patty Huang
f4e3551eb1 Support 24k and 32k config for LE Audio Offload
Bug: 230402180
Test: Manual
Change-Id: If4931999009b27423adeab3af50238dd6d8c8637
2022-04-28 10:53:29 +08:00
Alice Kuo
adcceec9ad Add A2dp decode software and offload session type
1. Add the interface
2. Add the default implementation
3. Add VTS

Bug: 206601670
Test: atest VtsHalBluetoothAudioTargetTest
Change-Id: I54d8037eeb09312c9f1fb75d2167cc50ac7cae8c
2022-03-29 15:09:50 +08:00
Josh Wu
5d50dc098d BtAudio: Handle bcast hw offloading codecs
Test: atest VtsHalBluetoothAudioTargetTest
Bug: 203490261
Change-Id: I0631838b4cc0462e3aadc581226d43f43a446d29
2022-02-15 09:19:05 -08:00
Treehugger Robot
d6b3341e55 Merge "Correct the offload capability and update comment(AIDL)" 2022-02-10 06:43:43 +00:00
Patty
03cbe7182d Correct the offload capability and update comment(AIDL)
- Add some comments to describe the supported scenario
- Correct the config from mono to stereo, when only one device is
  connected, mono only need one audio channel, for stereo case,
  support 2 audio channels.

Tag: #feature
Bug: 203535499
Bug: 150670922
Test: make build
Change-Id: Id3ea1e96a6b4fd7a209a015fb5c475465e300cdb
2022-02-10 10:07:17 +08:00
Sagar Verma
d13bbb3256 BT: Aptx-Adaptive AIDL changes
Bug: 203751353
Change-Id: I65f7b4de77ff0083721069959f6ba2081a158a80
2022-01-29 16:15:41 +05:30
Josh Wu
75462aafb5 BtAudio: Improve LE offload compatability
Bug: 203490261
Test: m android.hardware.bluetooth.audio-V1-impl
Change-Id: I7dd37cb697b03bb5fe0bdc467f8e190575e0e2e1
2022-01-23 08:30:13 -08:00
Alice Kuo
ce87f91873 Add a2dp vendor codec extension
Bug: 215645164
Test: make build
Change-Id: I1ed80ab5cd4a9fbb9ea6fef7a5192241af76f1ea
2022-01-21 13:08:02 +08:00
Alice Kuo
79c936debe Add vendor codec type to support the vendor config and capability
Bug: 203490261
Bug: 150670922
Test: make build
Change-Id: I26cdafe6b96a4c0a501f13bf790723c026029aa6
2022-01-20 23:14:19 +08:00
Josh Wu
20bac52a5b Add Bluetooth Audio AIDL utils
Test: manual
Bug: 203490261
Change-Id: Ia299a61e89273ea1c9d132425598975418f57a03
2022-01-17 06:32:52 +00:00