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

Commit 7d479b83 authored by Jakub Tyszkowski's avatar Jakub Tyszkowski
Browse files

LeAudio: Fix invalid audio set config references 

There were references to non-existing configuration.
Missing configs were added where possible and invalid
references were fixed.

Bug: 295972694
Test: atest --host bluetooth_le_audio_test bluetooth_le_audio_client_test  bluetooth_test_broadcaster bluetooth_test_broadcaster_state_machine bluetooth_le_audio_codec_manager_test
Flag: EXEMPT; non-flagable refactor, verified with unit tests
Change-Id: I59cfa2313406bcb52097fad5485968423583464d
parent 446015fd

system/bta/le_audio/audio_set_configurations.json

+18 −8
Original line number Diff line number Diff line
@@ -172,6 +172,11 @@ 
            "codec_config_name": "SingleDev_OneChanMonoSnk_32_1",

            "qos_config_name": ["QoS_Config_32_1_1"]

        },

        {

            "name": "SingleDev_OneChanMonoSnk_32_1_2",

            "codec_config_name": "SingleDev_OneChanMonoSnk_32_1",

            "qos_config_name": ["QoS_Config_32_1_2"]

        },

        {

            "name": "SingleDev_OneChanMonoSnk_32_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanMonoSnk_32_2",
@@ -182,6 +187,11 @@ 
            "codec_config_name": "SingleDev_OneChanMonoSnk_32_2",

            "qos_config_name": ["QoS_Config_32_2_1"]

        },

        {

            "name": "SingleDev_OneChanMonoSnk_32_2_2",

            "codec_config_name": "SingleDev_OneChanMonoSnk_32_2",

            "qos_config_name": ["QoS_Config_32_2_2"]

        },

        {

            "name": "SingleDev_OneChanMonoSnk_16_1_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanMonoSnk_16_1",
@@ -943,42 +953,42 @@ 
            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_1_OneChanMonoSrc_24_2_Balanced_Reliability",

            "name": "SingleDev_TwoChanStereoSnk_48_4_OneChanMonoSrc_24_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4_OneChanMonoSrc_24_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_1_OneChanMonoSrc_16_2_Balanced_Reliability",

            "name": "SingleDev_TwoChanStereoSnk_48_4_OneChanMonoSrc_16_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4_OneChanMonoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanStereoSnk_48_4_1_OneChanMonoSrc_32_2_Balanced_Reliability",

            "name": "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_32_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_32_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanStereoSnk_48_4_1_OneChanMonoSrc_24_2_Balanced_Reliability",

            "name": "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_24_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_24_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanStereoSnk_48_4_1_OneChanMonoSrc_16_2_Balanced_Reliability",

            "name": "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_16_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanMonoSnk_48_4_1_OneChanMonoSrc_32_2_Balanced_Reliability",

            "name": "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_32_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_32_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanMonoSnk_48_4_1_OneChanMonoSrc_24_2_1_Balanced_Reliability",

            "name": "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_24_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_24_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

        {

            "name": "SingleDev_OneChanMonoSnk_48_4_1_OneChanMonoSrc_16_2_Balanced_Reliability",

            "name": "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_16_2_Balanced_Reliability",

            "codec_config_name": "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_16_2",

            "qos_config_name": ["QoS_Config_Balanced_Reliability"]

        },

system/bta/le_audio/audio_set_scenarios.json

+1 −2
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ 
                "SingleDev_OneChanMonoSrc_24_1_Balanced_Reliability",

                "SingleDev_OneChanMonoSrc_16_2_Balanced_Reliability",

                "SingleDev_OneChanMonoSrc_16_1_Balanced_Reliability",

                "VND_SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32khz_Server_Prefered_1",

                "VND_SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32khz_60oct_R3_L22_1",

                "VND_SingleDev_TwoChanStereoSnk_OneChanStereoSrc_32khz_60oct_R3_L22_1",

                "DualDev_OneChanMonoSnk_16_2_Balanced_Reliability",

                "SingleDev_OneChanStereoSnk_16_2_Balanced_Reliability",

                "SingleDev_TwoChanStereoSnk_16_2_Balanced_Reliability",