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

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

Merge "Use transparent codec for DSA hardware path" into main am: 388d831d 

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



Change-Id: Ie9dbf79b60e6ab0c76996f4deeb8e1b688545160
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b103ee1c 388d831d

system/bta/le_audio/state_machine.cc

+11 −5
Original line number Diff line number Diff line
@@ -923,13 +923,21 @@ public: 
    }



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

    bluetooth::le_audio::types::LeAudioCodecId codec = {

            .coding_format = bluetooth::hci::kIsoCodingFormatTransparent,

            .vendor_company_id = 0x0000,

            .vendor_codec_id = 0x0000};

    log::info("DSA mode used: {}", static_cast<int>(group->dsa_.mode));

    switch (group->dsa_.mode) {

      case DsaMode::ISO_HW:

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

        if (!com::android::bluetooth::flags::dsa_hw_transparent_codec()) {

          codec = bluetooth::le_audio::types::kLeAudioCodecHeadtracking;

        }

        break;

      case DsaMode::ISO_SW:

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

        codec = bluetooth::le_audio::types::kLeAudioCodecHeadtracking;

        break;

      default:

        log::warn("Unexpected DsaMode: {}", static_cast<int>(group->dsa_.mode));
@@ -951,11 +959,9 @@ public: 
    bluetooth::hci::iso_manager::iso_data_path_params param = {

            .data_path_dir = bluetooth::hci::iso_manager::kIsoDataPathDirectionOut,

            .data_path_id = data_path_id,

            .codec_id_format = bluetooth::le_audio::types::kLeAudioCodecHeadtracking.coding_format,

            .codec_id_company =

                    bluetooth::le_audio::types::kLeAudioCodecHeadtracking.vendor_company_id,

            .codec_id_vendor =

                    bluetooth::le_audio::types::kLeAudioCodecHeadtracking.vendor_codec_id,

            .codec_id_format = codec.coding_format,

            .codec_id_company = codec.vendor_company_id,

            .codec_id_vendor = codec.vendor_codec_id,

            .controller_delay = 0x00000000,

            .codec_conf = std::vector<uint8_t>(),

    };