gsm48_cc_tx_setup: use MNCC bcaps for CSD

Use the MNCC bearer capabilities in CC setup for CSD, if available.

Note that in the MNCC_F_BEARER_CAP code path sdp_audio_codecs_set_csd()
also gets called by trans_cc_set_remote_from_bc().

Related: OS#4394
Change-Id: I56e49ebc41696912a81b8f4f63fbc36d0b605e9e
This commit is contained in:
Oliver Smith 2023-07-05 15:47:04 +02:00
parent 8d0aa26166
commit 412cf92d3c
1 changed files with 10 additions and 1 deletions

View File

@ -826,7 +826,16 @@ static int gsm48_cc_tx_setup(struct gsm_trans *trans, void *arg)
"Got no information of remote audio codecs: neither SDP nor Bearer Capability. Trying anyway.\n");
break;
case GSM48_BCAP_ITCAP_UNR_DIG_INF:
sdp_audio_codecs_set_csd(&trans->cc.codecs.ms);
if (setup->fields & MNCC_F_BEARER_CAP) {
trans->cc.remote = (struct sdp_msg){};
trans_cc_set_remote_from_bc(trans, &setup->bearer_cap);
LOG_TRANS_CAT(trans, DMNCC, LOGL_DEBUG, "rx %s Bearer Cap: remote=%s\n",
get_mncc_name(setup->msg_type), sdp_msg_to_str(&trans->cc.remote));
} else {
LOG_TRANS(trans, LOGL_INFO,
"Got no information of remote Bearer Capability. Trying anyway.\n");
sdp_audio_codecs_set_csd(&trans->cc.codecs.ms);
}
break;
default:
LOG_TRANS(trans, LOGL_ERROR, "Handling of information transfer capability %d not implemented\n",