external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

RTC: Print stat for pli and timer every 5s. 4.0.70

Browse source
This commit is contained in:
winlin 2021-02-08 11:51:48 +08:00
parent 18c27111e0
commit 4539ffa086
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -155,6 +155,7 @@ For previous versions, please read:
## V4 changes ## V4 changes
* v4.0, 2021-02-08, RTC: Print stat for pli and timer every 5s. 4.0.70
* v4.0, 2021-02-07, RTC: Parse PT fast and refine udp handler. 4.0.69 * v4.0, 2021-02-07, RTC: Parse PT fast and refine udp handler. 4.0.69
* v4.0, 2021-02-05, RTC: Refine UDP packet peer fast id. 4.0.68 * v4.0, 2021-02-05, RTC: Refine UDP packet peer fast id. 4.0.68
* v4.0, 2021-02-04, RTC: Reuse UDP socket to receive packet. 4.0.67 * v4.0, 2021-02-04, RTC: Reuse UDP socket to receive packet. 4.0.67

10
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -949,9 +949,9 @@ srs_error_t SrsRtcPublishStream::initialize(SrsRequest* r, SrsRtcStreamDescripti
nack_enabled_ = _srs_config->get_rtc_nack_enabled(req->vhost); nack_enabled_ = _srs_config->get_rtc_nack_enabled(req->vhost);
pt_to_drop_ = (uint16_t)_srs_config->get_rtc_drop_for_pt(req->vhost); pt_to_drop_ = (uint16_t)_srs_config->get_rtc_drop_for_pt(req->vhost);
bool twcc_enabled = _srs_config->get_rtc_twcc_enabled(req->vhost); twcc_enabled_ = _srs_config->get_rtc_twcc_enabled(req->vhost);
srs_trace("RTC publisher nack=%d, pt-drop=%u, twcc=%u/%d", nack_enabled_, pt_to_drop_, twcc_enabled, twcc_id); srs_trace("RTC publisher nack=%d, pt-drop=%u, twcc=%u/%d", nack_enabled_, pt_to_drop_, twcc_enabled_, twcc_id);
session_->stat_->nn_publishers++; session_->stat_->nn_publishers++;
@ -1231,6 +1231,10 @@ srs_error_t SrsRtcPublishStream::check_send_nacks()
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
if (!nack_enabled_) {
return err;
}
for (int i = 0; i < (int)video_tracks_.size(); ++i) { for (int i = 0; i < (int)video_tracks_.size(); ++i) {
SrsRtcVideoRecvTrack* track = video_tracks_.at(i); SrsRtcVideoRecvTrack* track = video_tracks_.at(i);
if ((err = track->check_send_nacks()) != srs_success) { if ((err = track->check_send_nacks()) != srs_success) {
@ -1441,7 +1445,7 @@ srs_error_t SrsRtcPublishStream::notify(int type, srs_utime_t interval, srs_utim
} }
} }
if (type == SRS_TICKID_TWCC) { if (twcc_enabled_ && type == SRS_TICKID_TWCC) {
// We should not depends on the received packet, // We should not depends on the received packet,
// instead we should send feedback every Nms. // instead we should send feedback every Nms.
if ((err = send_periodic_twcc()) != srs_success) { if ((err = send_periodic_twcc()) != srs_success) {

1
trunk/src/app/srs_app_rtc_conn.hpp
View file

@ -319,6 +319,7 @@ private:
uint16_t pt_to_drop_; uint16_t pt_to_drop_;
// Whether enabled nack. // Whether enabled nack.
bool nack_enabled_; bool nack_enabled_;
bool twcc_enabled_;
private: private:
bool request_keyframe_; bool request_keyframe_;
SrsErrorPithyPrint* pli_epp; SrsErrorPithyPrint* pli_epp;

2
trunk/src/core/srs_core_version4.hpp
View file

@ -24,6 +24,6 @@
#ifndef SRS_CORE_VERSION4_HPP #ifndef SRS_CORE_VERSION4_HPP
#define SRS_CORE_VERSION4_HPP #define SRS_CORE_VERSION4_HPP
#define SRS_VERSION4_REVISION 69 #define SRS_VERSION4_REVISION 70
#endif #endif