external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

tenfold: use timer send nacks

Browse source
This commit is contained in:
jinxue.cgh 2020-05-15 18:13:03 +08:00 • committed by 忘篱
parent 392e2c8161
commit c875639eb6
3 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1376,7 +1376,7 @@ srs_error_t SrsRtcPlayer::on_rtcp_rr(char* data, int nb_data)
SrsRtcPublisher::SrsRtcPublisher(SrsRtcSession* session) SrsRtcPublisher::SrsRtcPublisher(SrsRtcSession* session)
{ {
report_timer = new SrsHourGlass(this, 200 * SRS_UTIME_MILLISECONDS); report_timer = new SrsHourGlass(this, 10 * SRS_UTIME_MILLISECONDS);
session_ = session; session_ = session;
request_keyframe_ = false; request_keyframe_ = false;
@ -1422,10 +1422,14 @@ srs_error_t SrsRtcPublisher::initialize(uint32_t vssrc, uint32_t assrc, SrsReque
srs_trace("RTC player video(ssrc=%u), audio(ssrc=%u), nack=%d", srs_trace("RTC player video(ssrc=%u), audio(ssrc=%u), nack=%d",
video_ssrc, audio_ssrc, nack_enabled_); video_ssrc, audio_ssrc, nack_enabled_);
if ((err = report_timer->tick(0 * SRS_UTIME_MILLISECONDS)) != srs_success) { if ((err = report_timer->tick(EVENT_REPORT, 200 * SRS_UTIME_MILLISECONDS)) != srs_success) {
return srs_error_wrap(err, "hourglass tick"); return srs_error_wrap(err, "hourglass tick");
} }
if ((err = report_timer->tick(EVENT_NACK, 10*SRS_UTIME_MILLISECONDS)) != srs_success) {
return srs_error_wrap(err, "NACK tick");
}
if ((err = report_timer->start()) != srs_success) { if ((err = report_timer->start()) != srs_success) {
return srs_error_wrap(err, "start report_timer"); return srs_error_wrap(err, "start report_timer");
} }
@ -2136,14 +2140,18 @@ void SrsRtcPublisher::request_keyframe()
srs_error_t SrsRtcPublisher::notify(int type, srs_utime_t interval, srs_utime_t tick) srs_error_t SrsRtcPublisher::notify(int type, srs_utime_t interval, srs_utime_t tick)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
// TODO: FIXME: Check error. // TODO: FIXME: Check error.
send_rtcp_rr(video_ssrc, video_queue_); if (type == EVENT_REPORT) {
send_rtcp_rr(audio_ssrc, audio_queue_); send_rtcp_rr(video_ssrc, video_queue_);
send_rtcp_xr_rrtr(video_ssrc); send_rtcp_rr(audio_ssrc, audio_queue_);
send_rtcp_xr_rrtr(audio_ssrc); send_rtcp_xr_rrtr(video_ssrc);
check_send_nacks(video_nack_, video_ssrc); send_rtcp_xr_rrtr(audio_ssrc);
check_send_nacks(audio_nack_, audio_ssrc); }
if (type == EVENT_NACK) {
check_send_nacks(video_nack_, video_ssrc);
check_send_nacks(audio_nack_, audio_ssrc);
}
return err; return err;
} }

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

@ -275,6 +275,8 @@ private:
SrsRtpNackForReceiver* video_nack_; SrsRtpNackForReceiver* video_nack_;
SrsRtpRingBuffer* audio_queue_; SrsRtpRingBuffer* audio_queue_;
SrsRtpNackForReceiver* audio_nack_; SrsRtpNackForReceiver* audio_nack_;
private:
enum {EVENT_REPORT=1, EVENT_NACK = 2};
private: private:
SrsRequest* req; SrsRequest* req;
SrsRtcSource* source; SrsRtcSource* source;

5
trunk/src/app/srs_app_rtc_queue.cpp
View file

@ -142,6 +142,11 @@ SrsNackOption::SrsNackOption()
max_alive_time = 2 * SRS_UTIME_SECONDS; max_alive_time = 2 * SRS_UTIME_SECONDS;
first_nack_interval = 10 * SRS_UTIME_MILLISECONDS; first_nack_interval = 10 * SRS_UTIME_MILLISECONDS;
nack_interval = 400 * SRS_UTIME_MILLISECONDS; nack_interval = 400 * SRS_UTIME_MILLISECONDS;
//TODO: FIXME:
// audio_max_retries = 2
// video_max_retries = 4
// nack_interval = 100ms
// first_nack_interval = 10ms
} }
SrsRtpNackInfo::SrsRtpNackInfo() SrsRtpNackInfo::SrsRtpNackInfo()