From 060641f22081c1d6adaa9357c9097217c97e5310 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 25 Nov 2015 15:42:51 -0600 Subject: [PATCH] FS-8293 make sanity level based on quality 2 and also in conference --- src/mod/applications/mod_av/avcodec.c | 2 +- src/mod/applications/mod_conference/conference_video.c | 2 +- src/mod/applications/mod_conference/mod_conference.c | 2 +- src/mod/codecs/mod_vpx/mod_vpx.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mod/applications/mod_av/avcodec.c b/src/mod/applications/mod_av/avcodec.c index 9b2bb89a66..b4afb7ab40 100644 --- a/src/mod/applications/mod_av/avcodec.c +++ b/src/mod/applications/mod_av/avcodec.c @@ -848,7 +848,7 @@ static switch_status_t open_encoder(h264_codec_context_t *context, uint32_t widt context->bandwidth = switch_calc_bitrate(context->codec_settings.video.width, context->codec_settings.video.height, 0, 0) * 8; } - sane = switch_calc_bitrate(1920, 1080, 1, 30); + sane = switch_calc_bitrate(1920, 1080, 2, 30); if (context->bandwidth > sane) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "BITRATE TRUNCATED TO %d\n", sane); diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index 489564e6e5..a31c76966d 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -1923,7 +1923,7 @@ void conference_video_check_auto_bitrate(conference_member_t *member, mcu_layer_ int max = 0; if (layer) { - kps = switch_calc_bitrate(w, h, 1, (int)(member->conference->video_fps.fps)); + kps = switch_calc_bitrate(w, h, 2, (int)(member->conference->video_fps.fps)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "%s auto-setting bitrate to %dkps to accomodate %dx%d resolution\n", switch_channel_get_name(member->channel), kps, layer->screen_w, layer->screen_h); } diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index a62896c1ec..2546112ff7 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -2864,7 +2864,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, 1, (int)conference->video_fps.fps); + conference->video_codec_settings.video.bandwidth = switch_calc_bitrate(canvas_w, canvas_h, 2, (int)conference->video_fps.fps); } else { conference->video_codec_settings.video.bandwidth = switch_parse_bandwidth_string(video_codec_bandwidth); } diff --git a/src/mod/codecs/mod_vpx/mod_vpx.c b/src/mod/codecs/mod_vpx/mod_vpx.c index b094bdeb18..2826cb8866 100644 --- a/src/mod/codecs/mod_vpx/mod_vpx.c +++ b/src/mod/codecs/mod_vpx/mod_vpx.c @@ -321,7 +321,7 @@ static switch_status_t init_encoder(switch_codec_t *codec) } - sane = switch_calc_bitrate(1920, 1080, 1, 30); + sane = switch_calc_bitrate(1920, 1080, 2, 30); if (context->bandwidth > sane) { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_WARNING, "BITRATE TRUNCATED FROM %d TO %d\n", context->bandwidth, sane);