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

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

Merge "leaudio: Apply QoS settings based on use scenarios" am: d9bd7a80 

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



Change-Id: Ib8ec0b4e209222203fbbdb15e0d5cad969893e9d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cbf682b1 d9bd7a80

system/bta/le_audio/audio_set_configurations.fbs

+13 −1
Original line number Diff line number Diff line
@@ -64,16 +64,28 @@ table AudioSetSubConfiguration { 
    codec_id : CodecId (required);

    codec_configuration: [CodecSpecificConfiguration] (required);

}

table CodecConfiguration {

    name: string (key, required);

    subconfigurations: [AudioSetSubConfiguration] (required);

}

table QosConfiguration {

    name: string (key, required);

    retransmission_number: ubyte;

    max_transport_latency : ushort;

}

/// Each set configration can contain multiple logical subconfigurations, which

/// all must be configurable with the current set of audio devices. For example,

/// one can define multiple output stream configurations with different

/// qualities, or assign different configurations to each stream direction.

table AudioSetConfiguration {

    name: string (key, required);

    subconfigurations: [AudioSetSubConfiguration] (required);

    codec_config_name: string (required);

    qos_config_name: string (required);

}

table AudioSetConfigurations {

    _comments_: [string];

    configurations: [AudioSetConfiguration] (required);

    codec_configurations: [CodecConfiguration] (required);

    qos_configurations: [QosConfiguration] (required);

}

root_type AudioSetConfigurations;

system/bta/le_audio/audio_set_configurations.json

+378 −1
Original line number Diff line number Diff line 
{

    "_comments_": [

        " == Audio Set Configurations == ",

        " Contains: ",

        "   1. configurations : ",

        "        Maps configuration name with codec and qos config to be used",

        "   2. codec_configurations : ",

        "        Array of codec specific configurations",

        "   3. qos_configurations : ",

        "        Array of QoS specific configurations",

        "        QoS configuration values are as per BAP spec 1.0",

        " Example values which can be used as 'codec_configuration.type'",

        "   Codec Configuration parameter types:",

        "     SUPPORTED_SAMPLING_FREQUENCY = 1",
@@ -34,6 +42,338 @@ 
        "     10000us = 1"

    ],

    "configurations": [

        {

            "name": "DualDev_OneChanStereoSnk_16_1_Server_Preferred",

            "codec_config_name": "DualDev_OneChanStereoSnk_16_1",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "DualDev_OneChanStereoSnk_16_1_1",

            "codec_config_name": "DualDev_OneChanStereoSnk_16_1",

            "qos_config_name": "QoS_Config_16_1_1"

        },

        {

            "name": "DualDev_OneChanStereoSnk_16_1_2",

            "codec_config_name": "DualDev_OneChanStereoSnk_16_1",

            "qos_config_name": "QoS_Config_16_1_2"

        },

        {

            "name": "DualDev_OneChanStereoSnk_16_2_Server_Preferred",

            "codec_config_name": "DualDev_OneChanStereoSnk_16_2",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "DualDev_OneChanStereoSnk_16_2_1",

            "codec_config_name": "DualDev_OneChanStereoSnk_16_2",

            "qos_config_name": "QoS_Config_16_2_1"

        },

        {

            "name": "DualDev_OneChanStereoSnk_16_2_2",

            "codec_config_name": "DualDev_OneChanStereoSnk_16_2",

            "qos_config_name": "QoS_Config_16_2_2"

        },

        {

            "name": "SingleDev_OneChanStereoSnk_16_1_Server_Preferred",

            "codec_config_name": "SingleDev_OneChanStereoSnk_16_1",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "SingleDev_OneChanStereoSnk_16_1_1",

            "codec_config_name": "SingleDev_OneChanStereoSnk_16_1",

            "qos_config_name": "QoS_Config_16_1_1"

        },

        {

            "name": "SingleDev_OneChanStereoSnk_16_1_2",

            "codec_config_name": "SingleDev_OneChanStereoSnk_16_1",

            "qos_config_name": "QoS_Config_16_1_2"

        },

        {

            "name": "SingleDev_OneChanStereoSnk_16_2_Server_Preferred",

            "codec_config_name": "SingleDev_OneChanStereoSnk_16_2",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "SingleDev_OneChanStereoSnk_16_2_1",

            "codec_config_name": "SingleDev_OneChanStereoSnk_16_2",

            "qos_config_name": "QoS_Config_16_2_1"

        },

        {

            "name": "SingleDev_OneChanStereoSnk_16_2_2",

            "codec_config_name": "SingleDev_OneChanStereoSnk_16_2",

            "qos_config_name": "QoS_Config_16_2_2"

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_16_1_Server_Preferred",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_16_1",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_16_1_1",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_16_1",

            "qos_config_name": "QoS_Config_16_1_1"

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_16_1_2",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_16_1",

            "qos_config_name": "QoS_Config_16_1_2"

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_16_2_Server_Preferred",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_16_2",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_16_2_1",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_16_2",

            "qos_config_name": "QoS_Config_16_2_1"

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_16_2_2",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_16_2",

            "qos_config_name": "QoS_Config_16_2_2"

        },

        {

            "name": "SingleDev_OneChanMonoSnk_16_1_Server_Preferred",

            "codec_config_name": "SingleDev_OneChanMonoSnk_16_1",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "SingleDev_OneChanMonoSnk_16_1_1",

            "codec_config_name": "SingleDev_OneChanMonoSnk_16_1",

            "qos_config_name": "QoS_Config_16_1_1"

        },

        {

            "name": "SingleDev_OneChanMonoSnk_16_1_2",

            "codec_config_name": "SingleDev_OneChanMonoSnk_16_1",

            "qos_config_name": "QoS_Config_16_1_2"

        },

        {

            "name": "SingleDev_OneChanMonoSnk_16_2_Server_Preferred",

            "codec_config_name": "SingleDev_OneChanMonoSnk_16_2",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "SingleDev_OneChanMonoSnk_16_2_1",

            "codec_config_name": "SingleDev_OneChanMonoSnk_16_2",

            "qos_config_name": "QoS_Config_16_2_1"

        },

        {

            "name": "SingleDev_OneChanMonoSnk_16_2_2",

            "codec_config_name": "SingleDev_OneChanMonoSnk_16_2",

            "qos_config_name": "QoS_Config_16_2_2"

        },

        {

            "name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_1_Server_Preferred",

            "codec_config_name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_1",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_1_1",

            "codec_config_name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_1",

            "qos_config_name": "QoS_Config_16_1_1"

        },

        {

            "name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_1_2",

            "codec_config_name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_1",

            "qos_config_name": "QoS_Config_16_1_2"

        },

        {

            "name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_2_Server_Preferred",

            "codec_config_name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_2",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_2_1",

            "codec_config_name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_2",

            "qos_config_name": "QoS_Config_16_2_1"

        },

        {

            "name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_2_2",

            "codec_config_name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_2",

            "qos_config_name": "QoS_Config_16_2_2"

        },

        {

            "name": "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_1_Server_Preferred",

            "codec_config_name": "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_1",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_1_1",

            "codec_config_name": "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_1",

            "qos_config_name": "QoS_Config_16_1_1"

        },

        {

            "name": "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_1_2",

            "codec_config_name": "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_1",

            "qos_config_name": "QoS_Config_16_1_2"

        },

        {

            "name": "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_2_Server_Preferred",

            "codec_config_name": "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_2",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_2_1",

            "codec_config_name": "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_2",

            "qos_config_name": "QoS_Config_16_2_1"

        },

        {

            "name": "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_2_2",

            "codec_config_name": "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_2",

            "qos_config_name": "QoS_Config_16_2_2"

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1_Server_Preferred",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1_1",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1",

            "qos_config_name": "QoS_Config_16_1_1"

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1_2",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1",

            "qos_config_name": "QoS_Config_16_1_2"

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2_Server_Preferred",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2_1",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2",

            "qos_config_name": "QoS_Config_16_2_1"

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2_2",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2",

            "qos_config_name": "QoS_Config_16_2_2"

        },

        {

            "name": "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_1_Server_Preferred",

            "codec_config_name": "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_1",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_1_1",

            "codec_config_name": "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_1",

            "qos_config_name": "QoS_Config_16_1_1"

        },

        {

            "name": "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_1_2",

            "codec_config_name": "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_1",

            "qos_config_name": "QoS_Config_16_1_2"

        },

        {

            "name": "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_2_Server_Preferred",

            "codec_config_name": "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_2",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_2_1",

            "codec_config_name": "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_2",

            "qos_config_name": "QoS_Config_16_2_1"

        },

        {

            "name": "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_2_2",

            "codec_config_name": "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_2",

            "qos_config_name": "QoS_Config_16_2_2"

        },

        {

            "name": "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_Server_Preferred",

            "codec_config_name": "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_1",

            "codec_config_name": "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1",

            "qos_config_name": "QoS_Config_16_1_1"

        },

        {

            "name": "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_2",

            "codec_config_name": "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1",

            "qos_config_name": "QoS_Config_16_1_2"

        },

        {

            "name": "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_Server_Preferred",

            "codec_config_name": "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_1",

            "codec_config_name": "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2",

            "qos_config_name": "QoS_Config_16_2_1"

        },

        {

            "name": "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_2",

            "codec_config_name": "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2",

            "qos_config_name": "QoS_Config_16_2_2"

        },

        {

            "name": "DualDev_OneChanStereoSnk_48_4_Server_Preferred",

            "codec_config_name": "DualDev_OneChanStereoSnk_48_4",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "DualDev_OneChanStereoSnk_48_4_1",

            "codec_config_name": "DualDev_OneChanStereoSnk_48_4",

            "qos_config_name": "QoS_Config_48_4_1"

        },

        {

            "name": "DualDev_OneChanStereoSnk_48_4_2",

            "codec_config_name": "DualDev_OneChanStereoSnk_48_4",

            "qos_config_name": "QoS_Config_48_4_2"

        },

        {

            "name": "SingleDev_OneChanStereoSnk_48_4_Server_Preferred",

            "codec_config_name": "SingleDev_OneChanStereoSnk_48_4",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "SingleDev_OneChanStereoSnk_48_4_1",

            "codec_config_name": "SingleDev_OneChanStereoSnk_48_4",

            "qos_config_name": "QoS_Config_48_4_1"

        },

        {

            "name": "SingleDev_OneChanStereoSnk_48_4_2",

            "codec_config_name": "SingleDev_OneChanStereoSnk_48_4",

            "qos_config_name": "QoS_Config_48_4_2"

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_Server_Preferred",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_1",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4",

            "qos_config_name": "QoS_Config_48_4_1"

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_48_4_2",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_48_4",

            "qos_config_name": "QoS_Config_48_4_2"

        },

        {

            "name": "SingleDev_OneChanMonoSnk_48_4_Server_Preferred",

            "codec_config_name": "SingleDev_OneChanMonoSnk_48_4",

            "qos_config_name": "QoS_Config_Server_Preferred"

        },

        {

            "name": "SingleDev_OneChanMonoSnk_48_4_1",

            "codec_config_name": "SingleDev_OneChanMonoSnk_48_4",

            "qos_config_name": "QoS_Config_48_4_1"

        },

        {

            "name": "SingleDev_OneChanMonoSnk_48_4_2",

            "codec_config_name": "SingleDev_OneChanMonoSnk_48_4",

            "qos_config_name": "QoS_Config_48_4_2"

        }

    ],

    "codec_configurations": [

        {

            "name": "DualDev_OneChanStereoSnk_16_2",

            "subconfigurations": [
@@ -2114,5 +2454,42 @@ 
                }

            ]

        }

    ],

    "qos_configurations": [

        {

            "name": "QoS_Config_16_1_1",

            "retransmission_number": 2,

            "max_transport_latency": 8

        },

        {

            "name": "QoS_Config_16_1_2",

            "retransmission_number": 13,

            "max_transport_latency": 75

        },

        {

            "name": "QoS_Config_16_2_1",

            "retransmission_number": 2,

            "max_transport_latency": 10

        },

        {

            "name": "QoS_Config_16_2_2",

            "retransmission_number": 13,

            "max_transport_latency": 95

        },

        {

            "name": "QoS_Config_48_4_1",

            "retransmission_number": 5,

            "max_transport_latency": 20

        },

        {

            "name": "QoS_Config_48_4_2",

            "retransmission_number": 13,

            "max_transport_latency": 100

        },

        {

            "name": "QoS_Config_Server_Preferred",

            "retransmission_number": 0,

            "max_transport_latency": 0

        }

    ]

}

system/bta/le_audio/audio_set_scenarios.json

+68 −34
Original line number Diff line number Diff line
@@ -8,55 +8,89 @@ 
        {

            "name": "Ringtone",

            "configurations": [

                "DualDev_OneChanStereoSnk_16_2",

                "DualDev_OneChanStereoSnk_16_1",

                "SingleDev_OneChanStereoSnk_16_2",

                "SingleDev_OneChanStereoSnk_16_1",

                "SingleDev_TwoChanStereoSnk_16_2",

                "SingleDev_TwoChanStereoSnk_16_1",

                "SingleDev_OneChanMonoSnk_16_2",

                "SingleDev_OneChanMonoSnk_16_1"

                "DualDev_OneChanStereoSnk_16_2_Server_Preferred",

                "DualDev_OneChanStereoSnk_16_2_1",

                "DualDev_OneChanStereoSnk_16_1_Server_Preferred",

                "DualDev_OneChanStereoSnk_16_1_1",

                "SingleDev_OneChanStereoSnk_16_2_Server_Preferred",

                "SingleDev_OneChanStereoSnk_16_2_1",

                "SingleDev_OneChanStereoSnk_16_1_Server_Preferred",

                "SingleDev_OneChanStereoSnk_16_1_1",

                "SingleDev_TwoChanStereoSnk_16_2_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_16_2_1",

                "SingleDev_TwoChanStereoSnk_16_1_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_16_1_1",

                "SingleDev_OneChanMonoSnk_16_2_Server_Preferred",

                "SingleDev_OneChanMonoSnk_16_2_1",

                "SingleDev_OneChanMonoSnk_16_1_Server_Preferred",

                "SingleDev_OneChanMonoSnk_16_1_1"

            ]

        },

        {

            "name": "Conversational",

            "configurations": [

                "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_2",

                "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_1",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_2",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_1",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_2",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_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_16_2_Server_Preferred",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_2_1",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_1_Server_Preferred",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_1_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_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_16_2_Server_Preferred",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_Server_Preferred",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_1"

            ]

        },

        {

            "name": "Media",

            "configurations": [

                "DualDev_OneChanStereoSnk_48_4",

                "DualDev_OneChanStereoSnk_16_2",

                "DualDev_OneChanStereoSnk_16_1",

                "SingleDev_OneChanStereoSnk_48_4",

                "SingleDev_OneChanStereoSnk_16_2",

                "SingleDev_OneChanStereoSnk_16_1",

                "SingleDev_TwoChanStereoSnk_48_4",

                "SingleDev_TwoChanStereoSnk_16_2",

                "SingleDev_TwoChanStereoSnk_16_1",

                "SingleDev_OneChanMonoSnk_48_4",

                "SingleDev_OneChanMonoSnk_16_2",

                "SingleDev_OneChanMonoSnk_16_1"

                "DualDev_OneChanStereoSnk_48_4_Server_Preferred",

                "DualDev_OneChanStereoSnk_48_4_2",

                "DualDev_OneChanStereoSnk_16_2_Server_Preferred",

                "DualDev_OneChanStereoSnk_16_2_2",

                "DualDev_OneChanStereoSnk_16_1_Server_Preferred",

                "DualDev_OneChanStereoSnk_16_1_2",

                "SingleDev_OneChanStereoSnk_48_4_Server_Preferred",

                "SingleDev_OneChanStereoSnk_48_4_2",

                "SingleDev_OneChanStereoSnk_16_2_Server_Preferred",

                "SingleDev_OneChanStereoSnk_16_2_2",

                "SingleDev_OneChanStereoSnk_16_1_Server_Preferred",

                "SingleDev_OneChanStereoSnk_16_1_2",

                "SingleDev_TwoChanStereoSnk_48_4_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_48_4_2",

                "SingleDev_TwoChanStereoSnk_16_2_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_16_2_2",

                "SingleDev_TwoChanStereoSnk_16_1_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_16_1_2",

                "SingleDev_OneChanMonoSnk_48_4_Server_Preferred",

                "SingleDev_OneChanMonoSnk_48_4_2",

                "SingleDev_OneChanMonoSnk_16_2_Server_Preferred",

                "SingleDev_OneChanMonoSnk_16_2_2",

                "SingleDev_OneChanMonoSnk_16_1_Server_Preferred",

                "SingleDev_OneChanMonoSnk_16_1_2"

            ]

        },

        {

            "name": "Default",

            "configurations": [

                "DualDev_OneChanStereoSnk_16_2",

                "SingleDev_OneChanStereoSnk_16_2",

                "SingleDev_TwoChanStereoSnk_16_2",

                "SingleDev_OneChanMonoSnk_16_2"

                "DualDev_OneChanStereoSnk_16_2_Server_Preferred",

                "DualDev_OneChanStereoSnk_16_2_1",

                "SingleDev_OneChanStereoSnk_16_2_Server_Preferred",

                "SingleDev_OneChanStereoSnk_16_2_1",

                "SingleDev_TwoChanStereoSnk_16_2_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_16_2_1",

                "SingleDev_OneChanMonoSnk_16_2_Server_Preferred",

                "SingleDev_OneChanMonoSnk_16_2_1"

            ]

        }

    ]

system/bta/le_audio/devices.cc

+3 −0
Original line number Diff line number Diff line
@@ -958,6 +958,9 @@ bool LeAudioDevice::ConfigureAses( 
                        *ase->codec_config.octets_per_codec_frame *

                        *ase->codec_config.codec_frames_blocks_per_sdu;



    ase->retrans_nb = ent.qos.retransmission_number;

    ase->max_transport_latency = ent.qos.max_transport_latency;



    ase->metadata = GetMetadata(context_type);



    DLOG(INFO) << __func__ << " device=" << address_

system/bta/le_audio/le_audio_set_configuration_provider_json.cc

+65 −10

File changed.

Preview size limit exceeded, changes collapsed.