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

RTC: Check error for send_rtcp_rr

Browse source
This commit is contained in:
winlin 2020-08-05 17:24:26 +08:00
parent 75119a14cf
commit f149c84dd0
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -958,12 +958,16 @@ srs_error_t SrsRtcPublishStream::send_rtcp_xr_rrtr()
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);
track->send_rtcp_xr_rrtr(); if ((err = track->send_rtcp_xr_rrtr()) != srs_success) {
return srs_error_wrap(err, "track=%s", track->get_track_id().c_str());
}
} }
for (int i = 0; i < (int)audio_tracks_.size(); ++i) { for (int i = 0; i < (int)audio_tracks_.size(); ++i) {
SrsRtcAudioRecvTrack* track = audio_tracks_.at(i); SrsRtcAudioRecvTrack* track = audio_tracks_.at(i);
track->send_rtcp_xr_rrtr(); if ((err = track->send_rtcp_xr_rrtr()) != srs_success) {
return srs_error_wrap(err, "track=%s", track->get_track_id().c_str());
}
} }
session_->stat_->nn_xr++; session_->stat_->nn_xr++;
@ -1521,8 +1525,10 @@ srs_error_t SrsRtcPublishStream::notify(int type, srs_utime_t interval, srs_utim
srs_freep(err); srs_freep(err);
} }
// TODO: FIXME: Check error. if ((err = send_rtcp_xr_rrtr()) != srs_success) {
send_rtcp_xr_rrtr(); srs_warn("XR err %s", srs_error_desc(err).c_str());
srs_freep(err);
}
// TODO: FIXME: Check error. // TODO: FIXME: Check error.
// We should not depends on the received packet, // We should not depends on the received packet,
@ -2197,10 +2203,7 @@ srs_error_t SrsRtcConnection::send_rtcp_xr_rrtr(uint32_t ssrc)
return srs_error_wrap(err, "protect rtcp xr"); return srs_error_wrap(err, "protect rtcp xr");
} }
// TDOO: FIXME: Check error. return sendonly_skt->sendto(protected_buf, nb_protected_buf, 0);
sendonly_skt->sendto(protected_buf, nb_protected_buf, 0);
return err;
} }
srs_error_t SrsRtcConnection::send_rtcp_fb_pli(uint32_t ssrc) srs_error_t SrsRtcConnection::send_rtcp_fb_pli(uint32_t ssrc)

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

@ -1569,7 +1569,7 @@ srs_error_t SrsRtcRecvTrack::send_rtcp_rr()
uint32_t ssrc = track_desc_->ssrc_; uint32_t ssrc = track_desc_->ssrc_;
const uint64_t& last_time = last_sender_report_sys_time; const uint64_t& last_time = last_sender_report_sys_time;
if ((err = session_->send_rtcp_rr(ssrc, rtp_queue_, last_time, last_sender_report_ntp)) != srs_success) { if ((err = session_->send_rtcp_rr(ssrc, rtp_queue_, last_time, last_sender_report_ntp)) != srs_success) {
return srs_error_wrap(err, "send RR ssrc=%u, last_time=%" PRId64, ssrc, last_time); return srs_error_wrap(err, "ssrc=%u, last_time=%" PRId64, ssrc, last_time);
} }
return err; return err;
@ -1577,7 +1577,13 @@ srs_error_t SrsRtcRecvTrack::send_rtcp_rr()
srs_error_t SrsRtcRecvTrack::send_rtcp_xr_rrtr() srs_error_t SrsRtcRecvTrack::send_rtcp_xr_rrtr()
{ {
return session_->send_rtcp_xr_rrtr(track_desc_->ssrc_); srs_error_t err = srs_success;
if ((err = session_->send_rtcp_xr_rrtr(track_desc_->ssrc_)) != srs_success) {
return srs_error_wrap(err, "ssrc=%u", track_desc_->ssrc_);
}
return err;
} }
bool SrsRtcRecvTrack::set_track_status(bool active) bool SrsRtcRecvTrack::set_track_status(bool active)