mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Squash: Merge SRS 4.0
This commit is contained in:
parent
a19c0fa121
commit
5042117034
3 changed files with 13 additions and 5 deletions
|
@ -264,7 +264,7 @@ srs_error_t SrsBandwidth::play_checking(SrsBandwidthSample* sample, SrsKbpsLimit
|
|||
limit->send_limit();
|
||||
}
|
||||
srs_update_system_time();
|
||||
sample->calc_kbps((int)_rtmp->get_send_bytes(), srsu2msi(srs_get_system_time() - starttime));
|
||||
sample->calc_kbps((int)_rtmp->get_send_bytes(), srs_get_system_time() - starttime);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
@ -342,7 +342,7 @@ srs_error_t SrsBandwidth::publish_checking(SrsBandwidthSample* sample, SrsKbpsLi
|
|||
limit->recv_limit();
|
||||
}
|
||||
srs_update_system_time();
|
||||
sample->calc_kbps((int)_rtmp->get_recv_bytes(), srsu2msi(srs_get_system_time() - starttime));
|
||||
sample->calc_kbps((int)_rtmp->get_recv_bytes(), srs_get_system_time() - starttime);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue