| commit | 4bf46c18a2497191b0c2c0a37f74aa4377aa54de | [log] [tgz] |
|---|---|---|
| author | Rongxuan Liu <rongxuan@google.com> | Fri Feb 10 23:21:32 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 10 23:21:32 2023 +0000 |
| tree | 694aea6ff59eb2c67ef67868f57287cdb21631f9 | |
| parent | 99a7dad41969bdef107261ab81d671cfb3bead04 [diff] | |
| parent | c1aea3238f2f228de1cbfbd96a3a30fabbd50e9f [diff] |
Add new field 'pcmStreamId' in LeAudioBroadcastConfiguration am: c1aea3238f Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2429182 Change-Id: Icc34337a5e59f606cb873edc967cb7d2ffaa2941 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/LeAudioBroadcastConfiguration.aidl b/bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/LeAudioBroadcastConfiguration.aidl index 7d53b0c..2945710 100644 --- a/bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/LeAudioBroadcastConfiguration.aidl +++ b/bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/LeAudioBroadcastConfiguration.aidl
@@ -41,5 +41,6 @@ char streamHandle; int audioChannelAllocation; android.hardware.bluetooth.audio.LeAudioCodecConfiguration leAudioCodecConfig; + char pcmStreamId; } }
diff --git a/bluetooth/audio/aidl/android/hardware/bluetooth/audio/LeAudioBroadcastConfiguration.aidl b/bluetooth/audio/aidl/android/hardware/bluetooth/audio/LeAudioBroadcastConfiguration.aidl index e9a1a0c..16503fb 100644 --- a/bluetooth/audio/aidl/android/hardware/bluetooth/audio/LeAudioBroadcastConfiguration.aidl +++ b/bluetooth/audio/aidl/android/hardware/bluetooth/audio/LeAudioBroadcastConfiguration.aidl
@@ -35,6 +35,10 @@ */ int audioChannelAllocation; LeAudioCodecConfiguration leAudioCodecConfig; + /* + * Pcm stream id to identify the source for given streamHandle. + */ + char pcmStreamId; } CodecType codecType; BroadcastStreamMap[] streamMap;
diff --git a/bluetooth/audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp b/bluetooth/audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp index 128ef61..6a913f7 100644 --- a/bluetooth/audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp +++ b/bluetooth/audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp
@@ -1570,6 +1570,10 @@ le_audio_broadcast_config.streamMap[0] .leAudioCodecConfig.set<LeAudioCodecConfiguration::lc3Config>( lc3_config); + le_audio_broadcast_config.streamMap[0].streamHandle = 0x0; + le_audio_broadcast_config.streamMap[0].pcmStreamId = 0x0; + le_audio_broadcast_config.streamMap[0].audioChannelAllocation = 0x1 << 0; + DataMQDesc mq_desc; auto aidl_retval = audio_provider_->startSession( audio_port_, AudioConfiguration(le_audio_broadcast_config),