sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modification based on comment 

- Don't use default PT number for telephone-event, instead use the local offer
This commit is contained in:
Riza Sulistyo 2023-08-16 09:57:22 +07:00
parent ca8bb64da2
commit db7bd6c890
3 changed files with 78 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pjmedia/include/pjmedia/config.h
View File

@ -459,16 +459,6 @@
# define PJMEDIA_DTMF_DURATION_MSEC 200
#endif
/**
* The payload type number of the DTMF/telephone-event is set dynamically out-of-band.
* In case that remote endpoint doesn't specify the the payload type number
* in the SDP, the incoming DTMF might be ignored (bad RTP PT number). Set this as the
* default payload type number for incoming DTMF/telephone-event if no payload type number
* is specified on the SDP.
*/
#ifndef PJMEDIA_DTMF_TEL_EVENT_RX_PT
# define PJMEDIA_DTMF_TEL_EVENT_RX_PT -1
#endif
/**
* Number of RTP packets received from different source IP address from the
@ -836,6 +826,17 @@
# define PJMEDIA_SDP_NEG_MAINTAIN_REMOTE_PT_MAP 0
#endif
/**
* In case that remote endpoint doesn't specify the the payload type number
* in the SDP, the incoming DTMF might get ignored due to unmatched PT number.
* This config enables the SDP negotiator to utilize the last payload type number
* from the telephone-event offer, when no answer is given.
*
* Default is 0 (no)
*/
#ifndef PJMEDIA_SDP_NEG_USE_OFFER_TEL_EVENT
# define PJMEDIA_SDP_NEG_USE_OFFER_TEL_EVENT 0
#endif
/**
* This specifies if the SDP negotiator should compare its content before

68
pjmedia/src/pjmedia/sdp_neg.c
View File

@ -853,6 +853,14 @@ static pj_status_t process_m_answer( pj_pool_t *pool,
} else {
/* Offer format priority based on answer format index/priority */
unsigned offer_fmt_prior[PJMEDIA_MAX_SDP_FMT];
#if defined(PJMEDIA_SDP_NEG_USE_OFFER_TEL_EVENT) && \
PJMEDIA_SDP_NEG_USE_OFFER_TEL_EVENT != 0
pj_bool_t has_tel_event = PJ_FALSE;
pjmedia_sdp_attr *tel_event_rtpmap = NULL, *tel_event_fmtp = NULL;
pj_str_t *tel_event_fmt = NULL;
#endif
/* Remove all format in the offer that has no matching answer */
for (i=0; i<offer->desc.fmt_count;) {
@ -908,6 +916,13 @@ static pj_status_t process_m_answer( pj_pool_t *pool,
offer, i, answer, j, 0) ==
PJ_SUCCESS)
{
#if defined(PJMEDIA_SDP_NEG_USE_OFFER_TEL_EVENT) && \
PJMEDIA_SDP_NEG_USE_OFFER_TEL_EVENT != 0
if (pj_strcmp2(&or_.enc_name, "telephone-event") == 0) {
has_tel_event = PJ_TRUE;
}
#endif
/* Match! */
break;
}
@ -921,16 +936,45 @@ static pj_status_t process_m_answer( pj_pool_t *pool,
* Remove it from our offer.
*/
pjmedia_sdp_attr *a;
#if defined(PJMEDIA_SDP_NEG_USE_OFFER_TEL_EVENT) && \
PJMEDIA_SDP_NEG_USE_OFFER_TEL_EVENT != 0
pj_bool_t is_tel_event = PJ_FALSE;
#endif
/* Remove rtpmap associated with this format */
a = pjmedia_sdp_media_find_attr2(offer, "rtpmap", fmt);
if (a)
if (a) {
#if defined(PJMEDIA_SDP_NEG_USE_OFFER_TEL_EVENT) && \
PJMEDIA_SDP_NEG_USE_OFFER_TEL_EVENT != 0
pjmedia_sdp_rtpmap r;
if (pjmedia_sdp_attr_get_rtpmap(a, &r) == PJ_SUCCESS) {
if (pj_strcmp2(&r.enc_name, "telephone-event") == 0) {
is_tel_event = PJ_TRUE;
tel_event_rtpmap = a;
tel_event_fmt = &offer->desc.fmt[i];
}
}
#endif
pjmedia_sdp_media_remove_attr(offer, a);
}
/* Remove fmtp associated with this format */
a = pjmedia_sdp_media_find_attr2(offer, "fmtp", fmt);
if (a)
if (a) {
#if defined(PJMEDIA_SDP_NEG_USE_OFFER_TEL_EVENT) && \
PJMEDIA_SDP_NEG_USE_OFFER_TEL_EVENT != 0
if (is_tel_event)
tel_event_fmtp = a;
#endif
pjmedia_sdp_media_remove_attr(offer, a);
}
/* Remove this format from offer's array */
pj_array_erase(offer->desc.fmt, sizeof(offer->desc.fmt[0]),
@ -948,6 +992,26 @@ static pj_status_t process_m_answer( pj_pool_t *pool,
return PJMEDIA_SDPNEG_EANSNOMEDIA;
}
#if defined(PJMEDIA_SDP_NEG_USE_OFFER_TEL_EVENT) && \
PJMEDIA_SDP_NEG_USE_OFFER_TEL_EVENT != 0
if (!has_tel_event) {
/* There's no matching telephone-event, restore the last PT number/fmt from
* local offer.
*/
if (tel_event_rtpmap && tel_event_fmtp) {
pj_array_insert(offer->desc.fmt, sizeof(offer->desc.fmt[0]),
offer->desc.fmt_count, offer->desc.fmt_count,
tel_event_fmt);
++offer->desc.fmt_count;
pjmedia_sdp_media_add_attr(offer, tel_event_rtpmap);
pjmedia_sdp_media_add_attr(offer, tel_event_fmtp);
offer_fmt_prior[i] = i;
}
}
#endif
/* Post process:
* - Resort offer formats so the order match to the answer.
* - Remove answer formats that unmatches to the offer.

2
pjmedia/src/pjmedia/stream_info.c
View File

@ -304,7 +304,7 @@ static pj_status_t get_audio_codec_info_param(pjmedia_stream_info *si,
/* Get incomming payload type for telephone-events */
si->rx_event_pt = PJMEDIA_DTMF_TEL_EVENT_RX_PT;
si->rx_event_pt = -1;
for (i=0; i<local_m->attr_count; ++i) {
pjmedia_sdp_rtpmap r;