From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 16 Dec 2015 20:05:30 +0000 (-0600)
Subject: FS-8595 contd
X-Git-Tag: v1.6.6~1^2~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7507636d48aac9a0ed19c328548af2bb994e1b3a;p=thirdparty%2Ffreeswitch.git

FS-8595 contd
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index a63ca22d93..d032f1eda6 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -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;
diff --git a/src/mod/applications/mod_conference/mod_conference.h b/src/mod/applications/mod_conference/mod_conference.h
index 9f0473b30e..5da0298982 100644
--- a/src/mod/applications/mod_conference/mod_conference.h
+++ b/src/mod/applications/mod_conference/mod_conference.h
@@ -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;