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

Commit 9ecd6eb0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Adjust the config order for different scenarios"

parents 42126819 a14614af

system/bta/le_audio/audio_set_scenarios.json

+46 −46
Original line number Diff line number Diff line
@@ -8,34 +8,34 @@ 
        {

            "name": "Conversational",

            "configurations": [

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_1",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2_1",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2_2",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_1_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_1_1",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_1_2",

                "DualDev_OneChanStereoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanMonoSrc_32_2_1",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_1",

                "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_2_1",

                "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_1_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_1_1",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_32_2_1",

                "DualDev_OneChanStereoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanMonoSrc_32_2_1",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_2_Low_Latency",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_2_1",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_1_Low_Latency",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_1_1",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_1",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_32_2_1",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2_1",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2_2",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_1_Low_Latency",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_1_1",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_1_2",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_1",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_32_2_1",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2_Low_Latency",
@@ -48,12 +48,12 @@ 
                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_2_1",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_1_Low_Latency",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_1_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_1",

                "DualDev_OneChanMonoSrc_16_2_Balanced_Reliability",

                "SingleDev_OneChanStereoSrc_16_2_Balanced_Reliability",

                "SingleDev_OneChanMonoSrc_48_4_Balanced_Reliability",
@@ -153,14 +153,14 @@ 
        {

            "name": "Game",

            "configurations": [

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_1_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_1_Low_Latency",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_1_Low_Latency",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_1_Low_Latency",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1_Low_Latency",
@@ -168,12 +168,12 @@ 
                "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_R5_L12_TwoChanStereoSrc_16khz_30octs_R3_L12_1",

                "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_High_Reliability_1",

                "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_R5_L12_1",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_2_Low_Latency",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_1_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "DualDev_OneChanStereoSnk_48_2_Low_Latency",

                "DualDev_OneChanStereoSnk_48_3_Low_Latency",

                "DualDev_OneChanStereoSnk_48_1_Low_Latency",
@@ -206,53 +206,53 @@ 
        {

            "name": "VoiceAssistants",

            "configurations": [

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_2_Balanced_Reliability",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_1_Balanced_Reliability",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_1",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2_1",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_1_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_1_1",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_1",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_1",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_2_Balanced_Reliability",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_1_Balanced_Reliability",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2_1",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_1_Low_Latency",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_1_1",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_1",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_32_2_1",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2_1",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1_Low_Latency",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_1",

                "DualDev_OneChanStereoSnk_48_4_OneChanStereoSrc_32_2_Balanced_Reliability",

                "DualDev_OneChanStereoSnk_48_4_OneChanStereoSrc_24_2_Balanced_Reliability",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_1",

                "DualDev_OneChanStereoSnk_48_4_OneChanStereoSrc_16_2_Balanced_Reliability",

                "DualDev_OneChanStereoSnk_48_4_OneChanMonoSrc_32_2_Balanced_Reliability",

                "DualDev_OneChanStereoSnk_48_4_OneChanMonoSrc_24_2_Balanced_Reliability",

                "DualDev_OneChanStereoSnk_48_4_OneChanStereoSrc_24_2_Balanced_Reliability",

                "DualDev_OneChanStereoSnk_48_4_OneChanStereoSrc_32_2_Balanced_Reliability",

                "DualDev_OneChanStereoSnk_48_4_OneChanMonoSrc_16_2_Balanced_Reliability",

                "DualDev_OneChanDoubleStereoSnk_48_4_OneChanMonoSrc_32_2_Balanced_Reliability",

                "DualDev_OneChanDoubleStereoSnk_48_4_OneChanMonoSrc_24_2_Balanced_Reliability",

                "DualDev_OneChanStereoSnk_48_4_OneChanMonoSrc_24_2_Balanced_Reliability",

                "DualDev_OneChanStereoSnk_48_4_OneChanMonoSrc_32_2_Balanced_Reliability",

                "DualDev_OneChanDoubleStereoSnk_48_4_OneChanMonoSrc_16_2_Balanced_Reliability",

                "SingleDev_TwoChanStereoSnk_48_4_TwoChanStereoSrc_32_2_Balanced_Reliability",

                "SingleDev_TwoChanStereoSnk_48_4_TwoChanStereoSrc_24_2_Balanced_Reliability",

                "DualDev_OneChanDoubleStereoSnk_48_4_OneChanMonoSrc_24_2_Balanced_Reliability",

                "DualDev_OneChanDoubleStereoSnk_48_4_OneChanMonoSrc_32_2_Balanced_Reliability",

                "SingleDev_TwoChanStereoSnk_48_4_TwoChanStereoSrc_16_2_Balanced_Reliability",

                "SingleDev_TwoChanStereoSnk_48_4_OneChanMonoSrc_32_2_Balanced_Reliability",

                "SingleDev_TwoChanStereoSnk_48_4_OneChanMonoSrc_24_2_Balanced_Reliability",

                "SingleDev_TwoChanStereoSnk_48_4_TwoChanStereoSrc_24_2_Balanced_Reliability",

                "SingleDev_TwoChanStereoSnk_48_4_TwoChanStereoSrc_32_2_Balanced_Reliability",

                "SingleDev_TwoChanStereoSnk_48_4_OneChanMonoSrc_16_2_Balanced_Reliability",

                "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_32_2_Balanced_Reliability",

                "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_24_2_Balanced_Reliability",

                "SingleDev_TwoChanStereoSnk_48_4_OneChanMonoSrc_24_2_Balanced_Reliability",

                "SingleDev_TwoChanStereoSnk_48_4_OneChanMonoSrc_32_2_Balanced_Reliability",

                "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_16_2_Balanced_Reliability",

                "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_32_2_Balanced_Reliability",

                "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_24_2_Balanced_Reliability",

                "SingleDev_OneChanStereoSnk_48_4_OneChanMonoSrc_32_2_Balanced_Reliability",

                "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_16_2_Balanced_Reliability",

                "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_24_2_Balanced_Reliability",

                "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_16_2_Balanced_Reliability"

                "SingleDev_OneChanMonoSnk_48_4_OneChanMonoSrc_32_2_Balanced_Reliability"

            ]

        },

        {
@@ -260,32 +260,32 @@ 
            "configurations": [

                "VND_SingleDev_TwoChanStereoSrc_48khz_100octs_Balanced_Reliability_1",

                "VND_SingleDev_TwoChanStereoSrc_48khz_100octs_R11_L40_1",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_2_Balanced_Reliability",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_1_Balanced_Reliability",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_1",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2_1",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_1_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_1_1",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_1",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_Low_Latency",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_32_2_1",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_2_Balanced_Reliability",

                "DualDev_OneChanStereoSnk_OneChanStereoSrc_48_1_Balanced_Reliability",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2_1",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_1_Low_Latency",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_1_1",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_1",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_32_2_1",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2_Low_Latency",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2_1",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1_Low_Latency",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_32_2_1",

                "SingleDev_OneChanMonoSrc_48_2_Balanced_Reliability",

                "SingleDev_OneChanMonoSrc_48_1_Balanced_Reliability",

                "SingleDev_OneChanMonoSrc_32_2_Balanced_Reliability",

system/bta/le_audio/le_audio_client_test.cc

+2 −2
Original line number Diff line number Diff line
@@ -4162,12 +4162,12 @@ TEST_F(UnicastTest, TwoEarbudsStreamingProfileDisconnect) { 
  Mock::VerifyAndClearExpectations(&mock_audio_hal_client_callbacks_);

}



TEST_F(UnicastTest, TwoEarbudsWithSourceSupporting32kHz) {

TEST_F(UnicastTest, EarbudsWithStereoSinkMonoSourceSupporting32kHz) {

  const RawAddress test_address0 = GetTestAddress(0);

  int group_id = 0;

  SetSampleDatabaseEarbudsValid(

      1, test_address0, codec_spec_conf::kLeAudioLocationStereo,

      codec_spec_conf::kLeAudioLocationStereo, default_channel_cnt,

      codec_spec_conf::kLeAudioLocationFrontLeft, default_channel_cnt,

      default_channel_cnt, 0x0024,

      /* source sample freq 32/16khz */ true, /*add_csis*/

      true,                                   /*add_cas*/