Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a83a9d50 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Minor refine the broadcast ISO setup comment" am: 86d8ad0c am:... 

Merge "Minor refine the broadcast ISO setup comment" am: 86d8ad0c am: 045bf2df am: f9ca2a0e am: ede108e9 am: 60e9f41c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2152397



Change-Id: I2f82d9e875ca84a21173c29f970060b3d5272267
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d5ec0064 60e9f41c

system/bta/le_audio/broadcaster/state_machine.cc

+7 −6
Original line number Diff line number Diff line
@@ -466,17 +466,18 @@ class BroadcastStateMachineImpl : public BroadcastStateMachine { 
  void TriggerIsoDatapathSetup(uint16_t conn_handle) {

    LOG_INFO("conn_hdl=%d", conn_handle);

    LOG_ASSERT(active_config_ != std::nullopt);



    /* Note: For the LC3 software encoding on the Host side, the coding format

     * should be set to 'Transparent' and no codec configuration shall be sent

     * to the controller. 'codec_id_company' and 'codec_id_vendor' shall be

     * ignored if 'codec_id_format' is not set to 'Vendor'.

     */

    auto data_path_id = bluetooth::hci::iso_manager::kIsoDataPathHci;

    if (CodecManager::GetInstance()->GetCodecLocation() !=

        CodecLocation::HOST) {

      data_path_id = bluetooth::hci::iso_manager::kIsoDataPathPlatformDefault;

    }



    /* Note: If the LC3 encoding isn't in the controller side, the coding format

     * should be set to 'Transparent' and no codec configuration shall be sent

     * to the controller. 'codec_id_company' and 'codec_id_vendor' shall be

     * ignored if 'codec_id_format' is not set to 'Vendor'. We currently only

     * support the codecLocation in the Host or ADSP side.

     */

    auto codec_id = sm_config_.codec_wrapper.GetLeAudioCodecId();

    uint8_t hci_coding_format =

        (codec_id.coding_format == le_audio::types::kLeAudioCodingFormatLC3)