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

Commit e2310069 authored by Patty's avatar Patty Committed by Patty Huang
Browse files

[LE Audio] Add the support for 32k config 

Add 32_2 config support for conversational

Bug: 230402180
Tag: #feature
Test: atest --host bluetooth_le_audio_test
Change-Id: I7325490dc3063f21c503911682c802daec0dc3de
(cherry picked from commit 160e3295)
Merged-In: I7325490dc3063f21c503911682c802daec0dc3de
parent 969c5b15

system/audio_hal_interface/aidl/le_audio_software_aidl.cc

+1 −0
Original line number Diff line number Diff line
@@ -360,6 +360,7 @@ std::unordered_map<int32_t, uint16_t> octets_per_frame_map{ 
    {30, ::le_audio::codec_spec_conf::kLeAudioCodecLC3FrameLen30},

    {40, ::le_audio::codec_spec_conf::kLeAudioCodecLC3FrameLen40},

    {60, ::le_audio::codec_spec_conf::kLeAudioCodecLC3FrameLen60},

    {80, ::le_audio::codec_spec_conf::kLeAudioCodecLC3FrameLen80},

    {120, ::le_audio::codec_spec_conf::kLeAudioCodecLC3FrameLen120}};



std::unordered_map<AudioLocation, uint32_t> audio_location_map{

system/bta/le_audio/audio_set_configurations.json

+853 −23

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/le_audio/audio_set_scenarios.json

+12 −0
Original line number Diff line number Diff line
@@ -29,16 +29,22 @@ 
        {

            "name": "Conversational",

            "configurations": [

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_Server_Preferred",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_1",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2_Server_Preferred",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2_1",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2_2",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_1_Server_Preferred",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_1_1",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_1_2",

                "DualDev_OneChanStereoSnk_OneChanMonoSrc_32_2_Server_Preferred",

                "DualDev_OneChanStereoSnk_OneChanMonoSrc_32_2_1",

                "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_2_Server_Preferred",

                "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_2_1",

                "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_1_Server_Preferred",

                "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_1_1",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_32_2_Server_Preferred",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_32_2_1",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_2_Server_Preferred",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_2_1",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_1_Server_Preferred",
@@ -49,14 +55,20 @@ 
                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_1_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_1_1",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_1_2",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_32_2_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_32_2_1",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2_1",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1_1",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_32_2_Server_Preferred",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_32_2_1",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_2_Server_Preferred",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_2_1",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_1_Server_Preferred",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_1_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_Server_Preferred",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_Server_Preferred",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_Server_Preferred",

system/bta/le_audio/devices_test.cc

+7 −1
Original line number Diff line number Diff line
@@ -199,12 +199,18 @@ bool IsLc3SettingSupported(LeAudioContextType context_type, Lc3SettingId id) { 
  /* Update those values, on any change of codec linked with content type */

  switch (context_type) {

    case LeAudioContextType::RINGTONE:

    case LeAudioContextType::CONVERSATIONAL:

      if (id == Lc3SettingId::LC3_16_1 || id == Lc3SettingId::LC3_16_2)

        return true;



      break;



    case LeAudioContextType::CONVERSATIONAL:

      if (id == Lc3SettingId::LC3_16_1 || id == Lc3SettingId::LC3_16_2 ||

          id == Lc3SettingId::LC3_32_2)

        return true;



      break;



    case LeAudioContextType::MEDIA:

      if (id == Lc3SettingId::LC3_16_1 || id == Lc3SettingId::LC3_16_2 ||

          id == Lc3SettingId::LC3_48_4 || id == Lc3SettingId::LC3_48_2 ||

system/bta/le_audio/le_audio_types.h

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ constexpr uint32_t kLeAudioLocationStereo = 
constexpr uint16_t kLeAudioCodecLC3FrameLen30 = 30;

constexpr uint16_t kLeAudioCodecLC3FrameLen40 = 40;

constexpr uint16_t kLeAudioCodecLC3FrameLen60 = 60;

constexpr uint16_t kLeAudioCodecLC3FrameLen80 = 80;

constexpr uint16_t kLeAudioCodecLC3FrameLen120 = 120;



}  // namespace codec_spec_conf