kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 16:58:35 +00:00
Code Issues Projects Releases Wiki Activity

[mod_amr] RFC4867 mode-set compliancy

Browse Source 
Yield to offered mode-set when set.

From RFC4867:
If a mode set was supplied in the offer, the answerer SHALL return the mode-set unmodified or reject the payload type.
This commit is contained in:
jay98237438 2019-11-21 13:40:56 +01:00 committed by jorgen
parent 66aa064588
commit e83c6a4607
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mod/codecs/mod_amr/mod_amr.c
View File

@ -243,7 +243,7 @@ static switch_status_t switch_amr_init(switch_codec_t *codec, switch_codec_flag_
switch_codec_fmtp_t codec_fmtp;
amr_codec_settings_t amr_codec_settings = { 0 };
int encoding, decoding;
int x, i, argc;
int x, i, argc, fmtptmp_pos;
char *argv[10];
char fmtptmp[128];
@ -329,25 +329,38 @@ static switch_status_t switch_amr_init(switch_codec_t *codec, switch_codec_flag_
if (context->enc_modes) {
/* choose the highest mode (bitrate) for high audio quality */
for (i = 7; i > -1; i--) {
for (i = SWITCH_AMR_MODES-2; i > -1; i--) {
if (context->enc_modes & (1 << i)) {
context->enc_mode = (switch_byte_t) i;
break;
}
}
/* re-create mode-set */
fmtptmp_pos = switch_snprintf(fmtptmp, sizeof(fmtptmp), "mode-set=");
for (i = 0; SWITCH_AMR_MODES-1 > i; ++i) {
if (context->enc_modes & (1 << i)) {
fmtptmp_pos += switch_snprintf(fmtptmp + fmtptmp_pos, sizeof(fmtptmp) - fmtptmp_pos, fmtptmp_pos > strlen("mode-set=") ? ",%d" : "%d", i);
}
}
} else {
/* use default mode-set */
fmtptmp_pos = switch_snprintf(fmtptmp, sizeof(fmtptmp), "mode-set=%d", context->enc_mode);
}
if (globals.adjust_bitrate) {
switch_set_flag(codec, SWITCH_CODEC_FLAG_HAS_ADJ_BITRATE);
}
if (!globals.volte) {
switch_snprintf(fmtptmp, sizeof(fmtptmp), "octet-align=%d; mode-set=%d", switch_test_flag(context, AMR_OPT_OCTET_ALIGN) ? 1 : 0,
context->enc_mode);
fmtptmp_pos += switch_snprintf(fmtptmp + fmtptmp_pos, sizeof(fmtptmp) - fmtptmp_pos, ";octet-align=%d", switch_test_flag(context, AMR_OPT_OCTET_ALIGN) ? 1 : 0);
} else {
/* some UEs reject the call with 488 if mode-change-capability is not 2 */
switch_snprintf(fmtptmp, sizeof(fmtptmp), "octet-align=%d; mode-set=%d; max-red=0; mode-change-capability=2",
switch_test_flag(context, AMR_OPT_OCTET_ALIGN) ? 1 : 0, context->enc_mode);
fmtptmp_pos += switch_snprintf(fmtptmp + fmtptmp_pos, sizeof(fmtptmp) - fmtptmp_pos, ";octet-align=%d;max-red=0;mode-change-capability=2",
switch_test_flag(context, AMR_OPT_OCTET_ALIGN) ? 1 : 0);
}
codec->fmtp_out = switch_core_strdup(codec->memory_pool, fmtptmp);