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

Commit 28d4faed authored by Jack He's avatar Jack He
Browse files

Revert "le_audio: Add two source requirements for conversational context" 

This reverts commit 0155bf80.

Reason for revert: b/223742694

Tag: #feature
Test: atest bluetooth_le_audio_client_test
Sponsor: jpawlowski@
Bug: 150670922

Change-Id: I21db91f6d338166dfa3d8efaa0877ddc3f6f62ae
parent 0155bf80

system/bta/le_audio/audio_set_configurations.json

+1 −257
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ 
            ]

        },

        {

            "name": "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2",

            "name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_2",

            "subconfigurations": [

                {

                    "device_cnt": 2,
@@ -697,133 +697,6 @@ 
                }

            ]

        },

        {

            "name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_2",

            "subconfigurations": [

                {

                    "device_cnt": 2,

                    "ase_cnt": 2,

                    "direction": "SINK",

                    "codec_id": {

                        "coding_format": 6,

                        "vendor_company_id": 0,

                        "vendor_codec_id": 0

                    },

                    "codec_configuration": [

                        {

                            "name": "sampling_frequency",

                            "type": 1,

                            "compound_value": {

                                "value": [

                                    3

                                ]

                            }

                        },

                        {

                            "name": "frame_duration",

                            "type": 2,

                            "compound_value": {

                                "value": [

                                    1

                                ]

                            }

                        },

                        {

                            "name": "audio_channel_allocation",

                            "type": 3,

                            "compound_value": {

                                "value": [

                                    1,

                                    0,

                                    0,

                                    0

                                ]

                            }

                        },

                        {

                            "name": "octets_per_codec_frame",

                            "type": 4,

                            "compound_value": {

                                "value": [

                                    40,

                                    0

                                ]

                            }

                        },

                        {

                            "name": "codec_frame_blocks_per_sdu",

                            "type": 5,

                            "compound_value": {

                                "value": [

                                    1

                                ]

                            }

                        }

                    ]

                },

                {

                    "device_cnt": 2,

                    "ase_cnt": 2,

                    "direction": "SOURCE",

                    "codec_id": {

                        "coding_format": 6,

                        "vendor_company_id": 0,

                        "vendor_codec_id": 0

                    },

                    "codec_configuration": [

                        {

                            "name": "sampling_frequency",

                            "type": 1,

                            "compound_value": {

                                "value": [

                                    3

                                ]

                            }

                        },

                        {

                            "name": "frame_duration",

                            "type": 2,

                            "compound_value": {

                                "value": [

                                    1

                                ]

                            }

                        },

                        {

                            "name": "audio_channel_allocation",

                            "type": 3,

                            "compound_value": {

                                "value": [

                                    1,

                                    0,

                                    0,

                                    0

                                ]

                            }

                        },

                        {

                            "name": "octets_per_codec_frame",

                            "type": 4,

                            "compound_value": {

                                "value": [

                                    40,

                                    0

                                ]

                            }

                        },

                        {

                            "name": "codec_frame_blocks_per_sdu",

                            "type": 5,

                            "compound_value": {

                                "value": [

                                    1

                                ]

                            }

                        }

                    ]

                }

            ]

        },

        {

            "name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_1",

            "subconfigurations": [
@@ -1207,135 +1080,6 @@ 
                }

            ]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_OneChanStereoSrc_16_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": [

                                    3

                                ]

                            }

                        },

                        {

                            "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": [

                                    40,

                                    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": [

                                    3

                                ]

                            }

                        },

                        {

                            "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": [

                                    40,

                                    0

                                ]

                            }

                        },

                        {

                            "name": "codec_frame_blocks_per_sdu",

                            "type": 5,

                            "compound_value": {

                                "value": [

                                    1

                                ]

                            }

                        }

                    ]

                }

            ]

        },

        {

            "name": "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2",

            "subconfigurations": [