diff options
author | Alfred E. Heggestad <aeh@db.org> | 2014-12-07 08:50:13 +0100 |
---|---|---|
committer | Alfred E. Heggestad <aeh@db.org> | 2014-12-07 08:50:13 +0100 |
commit | 5dfe33ac12f39c75c5e66781df9478b3469d7709 (patch) | |
tree | 96ed78a558acd437a2ed887c33979dc74e3a1d29 | |
parent | b62ab004f458a8e3126114743ee1389c08e6eac9 (diff) |
use correct definition of kilobit (1000 bits)
http://en.wikipedia.org/wiki/Kilobit
-rw-r--r-- | modules/avcodec/encode.c | 2 | ||||
-rw-r--r-- | src/config.c | 6 | ||||
-rw-r--r-- | src/stream.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/modules/avcodec/encode.c b/modules/avcodec/encode.c index db4ae3b..f68b31f 100644 --- a/modules/avcodec/encode.c +++ b/modules/avcodec/encode.c @@ -349,7 +349,7 @@ static int open_encoder_x264(struct videnc_state *st, struct videnc_param *prm, xprm.i_csp = X264_CSP_I420; xprm.i_fps_num = prm->fps; xprm.i_fps_den = 1; - xprm.rc.i_bitrate = prm->bitrate / 1024; /* kbit/s */ + xprm.rc.i_bitrate = prm->bitrate / 1000; /* kbit/s */ xprm.rc.i_rc_method = X264_RC_CQP; xprm.i_log_level = X264_LOG_WARNING; diff --git a/src/config.c b/src/config.c index f7ca5bb..68512b9 100644 --- a/src/config.c +++ b/src/config.c @@ -48,7 +48,7 @@ static struct config core_config = { "", "", "", "", 352, 288, - 512000, + 500000, 25, }, #endif @@ -193,8 +193,8 @@ int config_parse_conf(struct config *cfg, const struct conf *conf) (void)conf_get_range(conf, "rtp_ports", &cfg->avt.rtp_ports); if (0 == conf_get_range(conf, "rtp_bandwidth", &cfg->avt.rtp_bw)) { - cfg->avt.rtp_bw.min *= 1024; - cfg->avt.rtp_bw.max *= 1024; + cfg->avt.rtp_bw.min *= 1000; + cfg->avt.rtp_bw.max *= 1000; } (void)conf_get_bool(conf, "rtcp_enable", &cfg->avt.rtcp_enable); (void)conf_get_bool(conf, "rtcp_mux", &cfg->avt.rtcp_mux); diff --git a/src/stream.c b/src/stream.c index 07f51bd..898f94a 100644 --- a/src/stream.c +++ b/src/stream.c @@ -523,7 +523,7 @@ void stream_set_bw(struct stream *s, uint32_t bps) if (!s) return; - sdp_media_set_lbandwidth(s->sdp, SDP_BANDWIDTH_AS, bps / 1024); + sdp_media_set_lbandwidth(s->sdp, SDP_BANDWIDTH_AS, bps / 1000); } |