Merge branch 'bugfix/btdm_can_not_get_informations_of_song_v3.3' into 'release/v3.3'

components/bt: Fix iphone can't get song's informations

See merge request espressif/esp-idf!5472
This commit is contained in:
Jiang Jiang Jian 2019-07-09 15:13:24 +08:00
commit 29cef5a9cc
2 changed files with 3 additions and 9 deletions

View file

@ -66,7 +66,7 @@ void bt_app_alloc_meta_buffer(esp_avrc_ct_cb_param_t *param)
uint8_t *attr_text = (uint8_t *) malloc (rc->meta_rsp.attr_length + 1);
if(!attr_text) {
ESP_LOGI(BT_AV_TAG, "malloc failed ");
return;
return;
}
memcpy(attr_text, rc->meta_rsp.attr_text, rc->meta_rsp.attr_length);
attr_text[rc->meta_rsp.attr_length] = 0;
@ -170,10 +170,6 @@ static void bt_av_hdl_avrc_evt(uint16_t event, void *p_param)
uint8_t *bda = rc->conn_stat.remote_bda;
ESP_LOGI(BT_AV_TAG, "AVRC conn_state evt: state %d, [%02x:%02x:%02x:%02x:%02x:%02x]",
rc->conn_stat.connected, bda[0], bda[1], bda[2], bda[3], bda[4], bda[5]);
if (rc->conn_stat.connected) {
bt_av_new_track();
}
break;
}
case ESP_AVRC_CT_PASSTHROUGH_RSP_EVT: {
@ -192,6 +188,7 @@ static void bt_av_hdl_avrc_evt(uint16_t event, void *p_param)
}
case ESP_AVRC_CT_REMOTE_FEATURES_EVT: {
ESP_LOGI(BT_AV_TAG, "AVRC remote features 0x%x", rc->rmt_feats.feat_mask);
bt_av_new_track();
break;
}
default:

View file

@ -171,10 +171,6 @@ static void bt_av_hdl_avrc_evt(uint16_t event, void *p_param)
uint8_t *bda = rc->conn_stat.remote_bda;
ESP_LOGI(BT_AV_TAG, "AVRC conn_state evt: state %d, [%02x:%02x:%02x:%02x:%02x:%02x]",
rc->conn_stat.connected, bda[0], bda[1], bda[2], bda[3], bda[4], bda[5]);
if (rc->conn_stat.connected) {
bt_av_new_track();
}
break;
}
case ESP_AVRC_CT_PASSTHROUGH_RSP_EVT: {
@ -193,6 +189,7 @@ static void bt_av_hdl_avrc_evt(uint16_t event, void *p_param)
}
case ESP_AVRC_CT_REMOTE_FEATURES_EVT: {
ESP_LOGI(BT_AV_TAG, "AVRC remote features %x", rc->rmt_feats.feat_mask);
bt_av_new_track();
break;
}
default: