commit | c1aea3238f2f228de1cbfbd96a3a30fabbd50e9f | [log] [tgz] |
---|---|---|
author | Rongxuan Liu <rongxuan@google.com> | Thu Jan 26 17:14:54 2023 +0000 |
committer | Rongxuan Liu <rongxuan@google.com> | Fri Feb 10 04:10:58 2023 +0000 |
tree | cbd9e230422876678d4fc8076180a13124723a91 | |
parent | 219c4e8d757ef479c18749a8455c8951f913391d [diff] |
Add new field 'pcmStreamId' in LeAudioBroadcastConfiguration This field is used to indicate the PCM stream source for given stream handle Tag: #feature Bug: 264692800 Test: m android.hardware.bluetooth.audio-update-api Change-Id: I3df9066e98ca552329bb58ae5fbc5346d1021b10 Merged-In: I3df9066e98ca552329bb58ae5fbc5346d1021b10
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),