Skip to content

TEL-6982: Emit /channels in AMR-WB rtpmap for strict IMS peers #569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
damirn wants to merge 1 commit into
base: telnyx/telephony/deploy-development
Choose a base branch
from
Open

TEL-6982: Emit /channels in AMR-WB rtpmap for strict IMS peers #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/include/switch_module_interfaces.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,8 @@ struct switch_codec_implementation {
uint32_t impl_id;
char *modname;
struct switch_codec_implementation *next;
/*! always write /channels in rtpmap even when channels == 1 (strict IMS peers) */
switch_bool_t always_emit_channels_in_rtpmap;
};

/*! \brief Top level module interface to implement a series of codec implementations */
Expand Down
2 changes: 2 additions & 0 deletions src/include/switch_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2820,6 +2820,8 @@ typedef struct payload_map_s {

struct payload_map_s *next;

switch_bool_t always_emit_channels_in_rtpmap;

} payload_map_t;

typedef enum {
Expand Down
2 changes: 2 additions & 0 deletions src/mod/codecs/mod_amrwb/mod_amrwb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,6 +932,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_amrwb_load)
SWITCH_CODEC_TYPE_AUDIO, 100, "AMR-WB", default_fmtp_oa,
16000, 16000, 23850, 20000, 320, 640, 0, 1, 1,
switch_amrwb_init, switch_amrwb_encode, switch_amrwb_decode, switch_amrwb_destroy);
codec_interface->implementations->always_emit_channels_in_rtpmap = SWITCH_TRUE;
#ifndef AMRWB_PASSTHROUGH
codec_interface->implementations->codec_control = switch_amrwb_control;
codec_interface->implementations->matches_fmtp = matches_fmtp;
Expand All @@ -946,6 +947,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_amrwb_load)
SWITCH_CODEC_TYPE_AUDIO, 110, "AMR-WB", default_fmtp_be,
16000, 16000, 23850, 20000, 320, 640, 0, 1, 1,
switch_amrwb_init, switch_amrwb_encode, switch_amrwb_decode, switch_amrwb_destroy);
codec_interface->implementations->always_emit_channels_in_rtpmap = SWITCH_TRUE;
#ifndef AMRWB_PASSTHROUGH
codec_interface->implementations->codec_control = switch_amrwb_control;
codec_interface->implementations->matches_fmtp = matches_fmtp;
Expand Down
7 changes: 4 additions & 3 deletions src/switch_core_media.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7985,6 +7985,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
pmap->codec_ms = mimp->microseconds_per_packet / 1000;
pmap->bitrate = mimp->bits_per_second;
pmap->channels = mimp->number_of_channels;
pmap->always_emit_channels_in_rtpmap = mimp->always_emit_channels_in_rtpmap;

if (!strcasecmp((char *) mmap->rm_encoding, "opus")) {
// Set adv_channels to what remote advertised, not based on our internal channels
Expand Down Expand Up @@ -12773,7 +12774,7 @@ static void generate_m(switch_core_session_t *session, char *buf, size_t buflen,
if (smh->ianacodes[i] > 95 || switch_channel_test_flag(session->channel, CF_VERBOSE_SDP)) {
int channels = get_channels(imp->iananame, imp->number_of_channels);

if (channels > 1) {
if (channels > 1 || imp->always_emit_channels_in_rtpmap) {
switch_snprintf(buf + strlen(buf), buflen - strlen(buf), "a=rtpmap:%d %s/%d/%d\r\n", smh->ianacodes[i], imp->iananame, rate, channels);

} else {
Expand Down Expand Up @@ -13661,7 +13662,7 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess
a_engine->cur_payload_map->adv_channels = get_channels(a_engine->cur_payload_map->rm_encoding, 1);
}

if (a_engine->cur_payload_map->adv_channels > 1) {
if (a_engine->cur_payload_map->adv_channels > 1 || a_engine->cur_payload_map->always_emit_channels_in_rtpmap) {
switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=rtpmap:%d %s/%d/%d\r\n",
a_engine->cur_payload_map->pt, a_engine->cur_payload_map->rm_encoding, rate, a_engine->cur_payload_map->adv_channels);
} else {
Expand Down Expand Up @@ -14187,7 +14188,7 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess
// red = ianacode;
//}

if (channels > 1) {
if (channels > 1 || imp->always_emit_channels_in_rtpmap) {
switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=rtpmap:%d %s/%d/%d\r\n", ianacode, imp->iananame,
imp->samples_per_second, channels);
} else {
Expand Down
Loading