kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[mod_opus] add cfg setting to overwrite the fmtp stereo param coming from remote. Eg: incoming SDP has stereo=1 but we want a mono call so we answer with stereo=0. 

* [mod_opus] add cfg setting to overwrite the fmtp stereo param coming from remote. Eg: incoming SDP has stereo=1 but we want a mono call so we answer with stereo=0.
sprop-stereo will be set to 0 too.

* [core] opus: use switch_core_max_audio_channels() with remote fmtp stereo=1 to allow disabling of stereo.
This commit is contained in:
Dragos Oancea 2021-05-14 18:36:30 +03:00 committed by GitHub
parent 53a52e1571
commit a562db760c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/testing/autoload_configs/opus.conf.xml
View File

@ -6,6 +6,7 @@
<param name="complexity" value="10"/>
<param name="use-jb-lookahead" value="true"/>
<param name="keep-fec-enabled" value="true"/>
<param name="adjust-bitrate" value="true"/>
<param name="adjust-bitrate" value="true"/>
<param name="mono" value="0"/>
</settings>
</configuration>

4
conf/vanilla/autoload_configs/opus.conf.xml
View File

@ -28,6 +28,8 @@
<!-- Max capture rate, 8000, 12000, 16000, 24000 and 48000 are valid options -->
<!--<param name="sprop-maxcapturerate" value="0"/>-->
<!-- Enable automatic bitrate variation during the call based on RTCP feedback -->
<!--<param name="adjust-bitrate" value="1"/>-->
<!--<param name="adjust-bitrate" value="1"/>-->
<!-- will enforce mono even if the remote party wants stereo. must be used in conjunction with param "max-audio-channels" set to 1 in switch.conf.xml. -->
<param name="mono" value="0"/>
</settings>
</configuration>

10
src/mod/codecs/mod_opus/mod_opus.c
View File

@ -160,6 +160,7 @@ struct {
int debuginfo;
uint32_t use_jb_lookahead;
switch_mutex_t *mutex;
int mono;
} opus_prefs;
static struct {
@ -283,7 +284,7 @@ static switch_status_t switch_opus_fmtp_parse(const char *fmtp, switch_codec_fmt
}
if (!strcasecmp(data, "stereo")) {
codec_settings->stereo = atoi(arg);
codec_settings->stereo = opus_prefs.mono ? 0 : atoi(arg);
codec_fmtp->stereo = codec_settings->stereo;
}
@ -563,6 +564,11 @@ static switch_status_t switch_opus_init(switch_codec_t *codec, switch_codec_flag
opus_codec_settings.usedtx = opus_prefs.use_dtx;
if (opus_prefs.mono) {
opus_codec_settings.stereo = 0;
opus_codec_settings.sprop_stereo = 0;
}
codec->fmtp_out = gen_fmtp(&opus_codec_settings, codec->memory_pool);
if (encoding) {
@ -1080,6 +1086,8 @@ static switch_status_t opus_load_config(switch_bool_t reload)
if (!switch_opus_acceptable_rate(opus_prefs.sprop_maxcapturerate)) {
opus_prefs.sprop_maxcapturerate = 0; /* value not supported */
}
} else if (!strcasecmp(key, "mono")) {
opus_prefs.mono = atoi(val);
}
}
}

8
src/switch_core_media.c
View File

@ -5774,7 +5774,13 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
pmap->adv_channels = 2; /* IKR ???*/
}
if (!zstr((char *) mmap->rm_fmtp) && switch_stristr("stereo=1", (char *) mmap->rm_fmtp)) {
pmap->channels = 2;
uint32_t allow_channels = switch_core_max_audio_channels(0);
if (!allow_channels || allow_channels >= 2) { /*default*/
pmap->channels = 2;
} else { /* allow_channels == 1 */
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Opus: setting 1 audio channel via config.\n");
pmap->channels = 1;
}
} else {
pmap->channels = 1;
}