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

Add telephone events if we maintain remote PT mapping (#3559)

This commit is contained in:
sauwming 2023-05-16 13:07:24 +08:00 committed by GitHub
parent de023c12fa
commit 022ce68be9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pjmedia/src/pjmedia/codec.c
View File

@ -85,8 +85,8 @@ void pjmedia_codec_mgr_insert_codec(pj_pool_t *pool, pj_str_t dyn_codecs[],
}
}
#if defined(PJMEDIA_RTP_PT_TELEPHONE_EVENTS) && \
PJMEDIA_RTP_PT_TELEPHONE_EVENTS != 0
#if PJMEDIA_RTP_PT_TELEPHONE_EVENTS != 0 || \
PJMEDIA_SDP_NEG_MAINTAIN_REMOTE_PT_MAP != 0
static void add_tel_event_clockrate(pjmedia_codec_mgr *mgr,
unsigned clock_rate)
@ -98,7 +98,8 @@ static void add_tel_event_clockrate(pjmedia_codec_mgr *mgr,
if (mgr->dyn_codecs_cnt >= PJ_ARRAY_SIZE(mgr->dyn_codecs))
return;
#if !PJMEDIA_TELEPHONE_EVENT_ALL_CLOCKRATES
#if !PJMEDIA_TELEPHONE_EVENT_ALL_CLOCKRATES && \
PJMEDIA_SDP_NEG_MAINTAIN_REMOTE_PT_MAP == 0
if (mgr->televent_num != 0)
return;
@ -184,6 +185,19 @@ PJ_DEF(pj_status_t) pjmedia_codec_mgr_init (pjmedia_codec_mgr *mgr,
if (status != PJ_SUCCESS)
return status;
#if PJMEDIA_SDP_NEG_MAINTAIN_REMOTE_PT_MAP != 0
{
/* If we need to keep track of remote PT, we have to add all telephone
* events which can potentially be offered by remote.
*/
add_tel_event_clockrate(mgr, 8000);
add_tel_event_clockrate(mgr, 16000);
add_tel_event_clockrate(mgr, 32000);
add_tel_event_clockrate(mgr, 44100);
add_tel_event_clockrate(mgr, 48000);
}
#endif
if (!def_codec_mgr)
def_codec_mgr = mgr;
@ -288,12 +302,13 @@ PJ_DEF(pj_status_t) pjmedia_codec_mgr_register_factory( pjmedia_codec_mgr *mgr,
pjmedia_codec_mgr_insert_codec(mgr->pool, mgr->dyn_codecs,
&mgr->dyn_codecs_cnt, &codec_id);
#if defined(PJMEDIA_RTP_PT_TELEPHONE_EVENTS) && \
PJMEDIA_RTP_PT_TELEPHONE_EVENTS != 0
add_tel_event_clockrate(mgr, info[i].clock_rate);
#endif
}
#if defined(PJMEDIA_RTP_PT_TELEPHONE_EVENTS) && \
PJMEDIA_RTP_PT_TELEPHONE_EVENTS != 0
/* Add telephone event */
add_tel_event_clockrate(mgr, info[i].clock_rate);
#endif
}
/* Update count */