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

Commit 75360b89 authored by Jack He's avatar Jack He Committed by Gerrit Code Review
Browse files

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

parents 645f0717 28d4faed
Loading
Loading
Loading
Loading
+1 −257
Original line number Original line Diff line number Diff line
@@ -571,7 +571,7 @@
            ]
            ]
        },
        },
        {
        {
            "name": "DualDev_OneChanStereoSnk_OneChanStereoSrc_16_2",
            "name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_2",
            "subconfigurations": [
            "subconfigurations": [
                {
                {
                    "device_cnt": 2,
                    "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",
            "name": "DualDev_OneChanStereoSnk_OneChanMonoSrc_16_1",
            "subconfigurations": [
            "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",
            "name": "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2",
            "subconfigurations": [
            "subconfigurations": [