From 4ccb83834d661b4b1baed6bdbeb8f24a5dd2ea81 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 27 Sep 2020 16:21:15 +0800 Subject: [PATCH] Fix Kbps resample bug --- trunk/src/protocol/srs_protocol_kbps.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/trunk/src/protocol/srs_protocol_kbps.cpp b/trunk/src/protocol/srs_protocol_kbps.cpp index 063b0dfae..11f119a53 100644 --- a/trunk/src/protocol/srs_protocol_kbps.cpp +++ b/trunk/src/protocol/srs_protocol_kbps.cpp @@ -166,22 +166,24 @@ void SrsKbps::set_io(ISrsProtocolStatistic* in, ISrsProtocolStatistic* out) int SrsKbps::get_send_kbps() { - srs_utime_t duration = clk->now() - is.starttime; + int duration = srsu2ms(clk->now() - is.starttime); if (duration <= 0) { return 0; } + int64_t bytes = get_send_bytes(); - return (int)(bytes * 8 / srsu2ms(duration)); + return (int)(bytes * 8 / duration); } int SrsKbps::get_recv_kbps() { - srs_utime_t duration = clk->now() - os.starttime; + int duration = srsu2ms(clk->now() - os.starttime); if (duration <= 0) { return 0; } + int64_t bytes = get_recv_bytes(); - return (int)(bytes * 8 / srsu2ms(duration)); + return (int)(bytes * 8 / duration); } int SrsKbps::get_send_kbps_30s()