From 3ac546fbf14ffe858e96755cc72e305aa89859cb Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 20 Nov 2015 16:24:35 -0600 Subject: [PATCH] FS-8293 fix some miscues on this patch --- src/mod/applications/mod_av/avcodec.c | 2 ++ src/mod/codecs/mod_vpx/mod_vpx.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mod/applications/mod_av/avcodec.c b/src/mod/applications/mod_av/avcodec.c index f65a6818bb..359be792e1 100644 --- a/src/mod/applications/mod_av/avcodec.c +++ b/src/mod/applications/mod_av/avcodec.c @@ -848,6 +848,8 @@ 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(context->codec_settings.video.width, context->codec_settings.video.height, 1, 30); + if (context->bandwidth > sane) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "BITRATE TRUNCATED TO %d\n", sane); context->bandwidth = sane * 8; diff --git a/src/mod/codecs/mod_vpx/mod_vpx.c b/src/mod/codecs/mod_vpx/mod_vpx.c index bfdbd5eb9c..44e93fc4d8 100644 --- a/src/mod/codecs/mod_vpx/mod_vpx.c +++ b/src/mod/codecs/mod_vpx/mod_vpx.c @@ -321,10 +321,10 @@ static switch_status_t init_encoder(switch_codec_t *codec) } - sane = switch_calc_bitrate(context->codec_settings.video.width, context->codec_settings.video.height, 4, 30); + sane = switch_calc_bitrate(context->codec_settings.video.width, context->codec_settings.video.height, 1, 30); if (context->bandwidth > sane) { - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_WARNING, "BITRATE TRUNCATED TO %d\n", sane); + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(codec->session), SWITCH_LOG_WARNING, "BITRATE TRUNCATED FROM %d TO %d\n", context->bandwidth, sane); context->bandwidth = sane; }