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

FS-8595 contd

This commit is contained in:
Anthony Minessale 2015-12-16 14:05:30 -06:00
parent 7f80d75010
commit 7507636d48
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1920,6 +1920,12 @@ void conference_video_check_auto_bitrate(conference_member_t *member, mcu_layer_
if (!switch_channel_test_flag(member->channel, CF_VIDEO_READY) || !vid_params.width || !vid_params.height) {
return;
}
if (vid_params.width != member->vid_params.width || vid_params.height != member->vid_params.height) {
member->managed_kps = 0;
}
member->vid_params = vid_params;
if (switch_channel_test_flag(member->channel, CF_VIDEO_BITRATE_UNMANAGABLE)) {
member->managed_kps = 0;
@ -1929,7 +1935,7 @@ void conference_video_check_auto_bitrate(conference_member_t *member, mcu_layer_
int min = 0;
kps = switch_calc_bitrate(layer->screen_w, layer->screen_h, member->conference->video_quality, (int)(member->conference->video_fps.fps));
min = kps / 4;
min = switch_calc_bitrate(vid_params.width, vid_params.height, member->conference->video_quality, (int)(member->conference->video_fps.fps)) / 4;
if (member->conference->max_bw_in) {
max = member->conference->max_bw_in;

1
src/mod/applications/mod_conference/mod_conference.h
View File

@ -748,6 +748,7 @@ struct conference_member {
char *video_logo;
char *video_mute_png;
char *video_reservation_id;
switch_vid_params_t vid_params;
switch_frame_buffer_t *fb;
switch_image_t *avatar_png_img;
switch_image_t *video_mute_img;