kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-03 03:50:10 +00:00
Code Issues Projects Releases Wiki Activity

FS-10571: [mod_conference,RTP] TMMBR messages request the same size for any user layout size when manage-inbound-video-bitrate enabled #resolve

Browse Source
This commit is contained in:
Anthony Minessale 2017-08-21 12:37:03 -05:00
parent 9fc65c8752
commit 10dfc93cdf
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod/applications/mod_conference/conference_video.c
View File

@ -2697,18 +2697,26 @@ void conference_video_set_incoming_bitrate(conference_member_t *member, int kps,
member->auto_kps_debounce_ticks = member->conference->auto_kps_debounce / member->conference->video_fps.ms; member->auto_kps_debounce_ticks = member->conference->auto_kps_debounce / member->conference->video_fps.ms;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "%s setting bitrate debounce timer to %dms\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "%s setting bitrate debounce timer to %dms\n",
switch_channel_get_name(member->channel), member->conference->auto_kps_debounce); switch_channel_get_name(member->channel), member->conference->auto_kps_debounce);
member->managed_kps = kps; member->managed_kps = kps;
member->managed_kps_set = 0; member->managed_kps_set = 0;
return; return;
} }
if (member->managed_kps_set == kps) {
return;
}
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "%s sending message to set bitrate to %dkps\n",
switch_channel_get_name(member->channel), kps);
msg.message_id = SWITCH_MESSAGE_INDICATE_BITRATE_REQ; msg.message_id = SWITCH_MESSAGE_INDICATE_BITRATE_REQ;
msg.numeric_arg = kps * 1024; msg.numeric_arg = kps * 1024;
msg.from = __FILE__; msg.from = __FILE__;
switch_core_session_receive_message(member->session, &msg); switch_core_session_receive_message(member->session, &msg);
member->managed_kps_set = 1; member->managed_kps_set = kps;
member->managed_kps = kps; member->managed_kps = kps;
} }
@ -2807,8 +2815,8 @@ void conference_video_check_auto_bitrate(conference_member_t *member, mcu_layer_
kps = kps_in; kps = kps_in;
} }
min_layer = kps / 2; min_layer = kps / 8;
min = kps_in / 2; min = kps_in / 8;
if (min_layer > min) min = min_layer; if (min_layer > min) min = min_layer;

2
src/mod/applications/mod_conference/mod_conference.c
View File

@ -2650,7 +2650,7 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
char *video_mute_banner = NULL; char *video_mute_banner = NULL;
conference_video_mode_t conference_video_mode = CONF_VIDEO_MODE_PASSTHROUGH; conference_video_mode_t conference_video_mode = CONF_VIDEO_MODE_PASSTHROUGH;
int conference_video_quality = 1; int conference_video_quality = 1;
int auto_kps_debounce = 30000; int auto_kps_debounce = 5000;
float fps = 30.0f; float fps = 30.0f;
uint32_t max_members = 0; uint32_t max_members = 0;
uint32_t announce_count = 0; uint32_t announce_count = 0;