mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-02 11:10:54 +03:00
Merge branch 'bugfix/a2dp_sink_nego_sbc_v5.5' into 'release/v5.5'
fix(bt): do not cap AVDTP Discover results by local SEP count (v5.5) See merge request espressif/esp-idf!51752
This commit is contained in:
@@ -145,8 +145,8 @@ enum {
|
|||||||
|
|
||||||
#define BTA_AV_LAST_EVT BTA_AV_API_SET_DELAY_VALUE_EVT
|
#define BTA_AV_LAST_EVT BTA_AV_API_SET_DELAY_VALUE_EVT
|
||||||
|
|
||||||
/* maximum number of SEPS in stream discovery results */
|
/* maximum number of SEPS in stream discovery results (keep in sync with AVDT) */
|
||||||
#define BTA_AV_NUM_SEPS 32
|
#define BTA_AV_NUM_SEPS AVDT_DIS_RES_MAX_NUM_SEPS
|
||||||
|
|
||||||
/* initialization value for AVRC handle */
|
/* initialization value for AVRC handle */
|
||||||
#define BTA_AV_RC_HANDLE_NONE 0xFF
|
#define BTA_AV_RC_HANDLE_NONE 0xFF
|
||||||
|
|||||||
@@ -2413,6 +2413,11 @@
|
|||||||
#define AVDT_NUM_SEPS 3
|
#define AVDT_NUM_SEPS 3
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Maximum number of peer SEPs accepted in AVDTP Discover results. */
|
||||||
|
#ifndef AVDT_DIS_RES_MAX_NUM_SEPS
|
||||||
|
#define AVDT_DIS_RES_MAX_NUM_SEPS 32
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Number of transport channels setup per media stream(audio or video) */
|
/* Number of transport channels setup per media stream(audio or video) */
|
||||||
#ifndef AVDT_NUM_CHANNELS
|
#ifndef AVDT_NUM_CHANNELS
|
||||||
|
|
||||||
|
|||||||
@@ -992,8 +992,8 @@ static UINT8 avdt_msg_prs_discover_rsp(tAVDT_MSG *p_msg, UINT8 *p, UINT16 len)
|
|||||||
if (p_msg->discover_rsp.num_seps > (len / 2)) {
|
if (p_msg->discover_rsp.num_seps > (len / 2)) {
|
||||||
p_msg->discover_rsp.num_seps = (len / 2);
|
p_msg->discover_rsp.num_seps = (len / 2);
|
||||||
}
|
}
|
||||||
if (p_msg->discover_rsp.num_seps > AVDT_NUM_SEPS) {
|
if (p_msg->discover_rsp.num_seps > AVDT_DIS_RES_MAX_NUM_SEPS) {
|
||||||
p_msg->discover_rsp.num_seps = AVDT_NUM_SEPS;
|
p_msg->discover_rsp.num_seps = AVDT_DIS_RES_MAX_NUM_SEPS;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* parse out sep info */
|
/* parse out sep info */
|
||||||
|
|||||||
Reference in New Issue
Block a user