FS-8293 add quality level 0 to conference (default is 1) and fix some logic in auto bw

src/include/switch_utils.h

@@ -995,14 +995,20 @@ SWITCH_DECLARE(char *) switch_util_quote_shell_arg_pool(const char *string, swit
 #define SWITCH_READ_ACCEPTABLE(status) (status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK || status == SWITCH_STATUS_INUSE)
 
 
-static inline int32_t switch_calc_bitrate(int w, int h, int quality, int fps)
+static inline int32_t switch_calc_bitrate(int w, int h, int quality, double fps)
 {
+	int r;
+
 	/* KUSH GAUGE*/
 
 	if (!fps) fps = 15;
-	if (!quality) quality = 2;
 	
-	return (int32_t)((float)(w * h * fps * quality) * 0.07) / 1000;
+	r = (int32_t)((double)(w * h * fps * (quality ? quality : 1)) * 0.07) / 1000;
+
+	if (!quality) r /= 2;
+
+	return r;
+
 }
 
 static inline int32_t switch_parse_bandwidth_string(const char *bwv)

src/mod/applications/mod_av/avcodec.c

@@ -845,7 +845,7 @@ static switch_status_t open_encoder(h264_codec_context_t *context, uint32_t widt
 	if (context->codec_settings.video.bandwidth) {
 		context->bandwidth = context->codec_settings.video.bandwidth * 8;
 	} else {
-		context->bandwidth = switch_calc_bitrate(context->codec_settings.video.width, context->codec_settings.video.height, 0, 0) * 8;
+		context->bandwidth = switch_calc_bitrate(context->codec_settings.video.width, context->codec_settings.video.height, 1, 15) * 8;
 	}
 
 	sane = switch_calc_bitrate(1920, 1080, 2, 30);

src/mod/applications/mod_conference/mod_conference.c

@@ -2725,10 +2725,10 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
 			} else if (!strcasecmp(var, "video-quality") && !zstr(val)) {
 				int tmp = atoi(val);
 
-				if (tmp > 0 && tmp < 5) {
+				if (tmp > -1 && tmp < 5) {
 					conference_video_quality = tmp;
 				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Video quality must be between 1 and 4\n");
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Video quality must be between 0 and 4\n");
 				}
 				
 			} else if (!strcasecmp(var, "video-mode") && !zstr(val)) {
@@ -2874,7 +2874,7 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
 
 		if (video_codec_bandwidth) {
 			if (!strcasecmp(video_codec_bandwidth, "auto")) {
-				conference->video_codec_settings.video.bandwidth = switch_calc_bitrate(canvas_w, canvas_h, conference->video_quality, (int)conference->video_fps.fps);
+				conference->video_codec_settings.video.bandwidth = switch_calc_bitrate(canvas_w, canvas_h, conference->video_quality, conference->video_fps.fps);
 			} else {
 				conference->video_codec_settings.video.bandwidth = switch_parse_bandwidth_string(video_codec_bandwidth);
 			}

src/mod/codecs/mod_openh264/mod_openh264.cpp

@@ -95,7 +95,7 @@ int FillSpecificParameters(h264_codec_context_t *context) {
 	if (context->codec_settings.video.bandwidth) {
 		context->bandwidth = context->codec_settings.video.bandwidth;
 	} else {
-		context->bandwidth = switch_calc_bitrate(context->codec_settings.video.width, context->codec_settings.video.height, 0, 0);
+		context->bandwidth = switch_calc_bitrate(context->codec_settings.video.width, context->codec_settings.video.height, 1, 15);
 	}
 
 	if (context->bandwidth > 5120) {

src/mod/codecs/mod_vpx/mod_vpx.c

@@ -317,7 +317,7 @@ static switch_status_t init_encoder(switch_codec_t *codec)
 	if (context->codec_settings.video.bandwidth) {
 		context->bandwidth = context->codec_settings.video.bandwidth;
 	} else {
-		context->bandwidth = switch_calc_bitrate(context->codec_settings.video.width, context->codec_settings.video.height, 0, 0);
+		context->bandwidth = switch_calc_bitrate(context->codec_settings.video.width, context->codec_settings.video.height, 1, 15);
 
 	}