]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-8293 fix some miscues on this patch
authorAnthony Minessale <anthm@freeswitch.org>
Fri, 20 Nov 2015 22:24:35 +0000 (16:24 -0600)
committerAnthony Minessale <anthm@freeswitch.org>
Fri, 20 Nov 2015 22:24:41 +0000 (16:24 -0600)
src/mod/applications/mod_av/avcodec.c
src/mod/codecs/mod_vpx/mod_vpx.c

index f65a6818bb3598ff7a6053a146062a631c7bcf69..359be792e171b655e13c1c59d80479df3739efa7 100644 (file)
@@ -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;
index bfdbd5eb9cb9259052ccd1ca59313f1deea31b64..44e93fc4d8a8b0c8ba6b53d515e4ecf8fec4f843 100644 (file)
@@ -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;
        }