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

Commit 8b16d2a3 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

leaudio: Add missing 32kHz options am: 70b8404b am: 35fc0cb1 

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



Change-Id: Ib9edac6be5267278028ca0da90a3c95fdf002d19
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e10cb71a 35fc0cb1

system/bta/le_audio/audio_set_configurations.json

+139 −0
Original line number Diff line number Diff line
@@ -232,6 +232,16 @@ 
            "codec_config_name": "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_1",

            "qos_config_name": ["QoS_Config_16_1_1"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_Server_Preferred",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2",

            "qos_config_name": ["QoS_Config_Server_Preferred"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_1",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2",

            "qos_config_name": ["QoS_Config_32_2_1"]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2_Server_Preferred",

            "codec_config_name": "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2",
@@ -1904,6 +1914,135 @@ 
                }

            ]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2",

            "subconfigurations": [

                {

                    "device_cnt": 1,

                    "ase_cnt": 1,

                    "direction": "SINK",

                    "configuration_strategy": "STEREO_ONE_CIS_PER_DEVICE",

                    "codec_id": {

                        "coding_format": 6,

                        "vendor_company_id": 0,

                        "vendor_codec_id": 0

                    },

                    "codec_configuration": [

                        {

                            "name": "sampling_frequency",

                            "type": 1,

                            "compound_value": {

                                "value": [

                                    6

                                ]

                            }

                        },

                        {

                            "name": "frame_duration",

                            "type": 2,

                            "compound_value": {

                                "value": [

                                    1

                                ]

                            }

                        },

                        {

                            "name": "audio_channel_allocation",

                            "type": 3,

                            "compound_value": {

                                "value": [

                                    3,

                                    0,

                                    0,

                                    0

                                ]

                            }

                        },

                        {

                            "name": "octets_per_codec_frame",

                            "type": 4,

                            "compound_value": {

                                "value": [

                                    80,

                                    0

                                ]

                            }

                        },

                        {

                            "name": "codec_frame_blocks_per_sdu",

                            "type": 5,

                            "compound_value": {

                                "value": [

                                    1

                                ]

                            }

                        }

                    ]

                },

                {

                    "device_cnt": 1,

                    "ase_cnt": 1,

                    "direction": "SOURCE",

                    "configuration_strategy": "STEREO_ONE_CIS_PER_DEVICE",

                    "codec_id": {

                        "coding_format": 6,

                        "vendor_company_id": 0,

                        "vendor_codec_id": 0

                    },

                    "codec_configuration": [

                        {

                            "name": "sampling_frequency",

                            "type": 1,

                            "compound_value": {

                                "value": [

                                    6

                                ]

                            }

                        },

                        {

                            "name": "frame_duration",

                            "type": 2,

                            "compound_value": {

                                "value": [

                                    1

                                ]

                            }

                        },

                        {

                            "name": "audio_channel_allocation",

                            "type": 3,

                            "compound_value": {

                                "value": [

                                    3,

                                    0,

                                    0,

                                    0

                                ]

                            }

                        },

                        {

                            "name": "octets_per_codec_frame",

                            "type": 4,

                            "compound_value": {

                                "value": [

                                    80,

                                    0

                                ]

                            }

                        },

                        {

                            "name": "codec_frame_blocks_per_sdu",

                            "type": 5,

                            "compound_value": {

                                "value": [

                                    1

                                ]

                            }

                        }

                    ]

                }

            ]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2",

            "subconfigurations": [

system/bta/le_audio/audio_set_scenarios.json

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ 
                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_2_1",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_1_Server_Preferred",

                "DualDev_OneChanDoubleStereoSnk_OneChanMonoSrc_16_1_1",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32_2_1",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2_Server_Preferred",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2_1",

                "SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_16_2_2",