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: Show error when send packets.

Browse source
This commit is contained in:
winlin 2020-08-10 15:24:26 +08:00
parent 6bc316016b
commit cf9a8c7dcb
2 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -495,15 +495,23 @@ srs_error_t SrsRtcPlayStream::cycle()
session_->stat_->nn_out_rtp += msg_count; session_->stat_->nn_out_rtp += msg_count;
total_pkts += msg_count; total_pkts += msg_count;
// Send-out all RTP packets and do cleanup. // Send-out all RTP packets and do cleanup
// TODO: FIXME: Handle error. if (true) {
send_packets(source, pkts, info); err = send_packets(source, pkts, info);
// TODO: FIXME: Use pithy print to show more smart information.
if (err != srs_success) {
err = srs_error_wrap(err, "RTP, SSRC=%u, SEQ=%u", pkt->header.get_ssrc(), pkt->header.get_sequence());
srs_warn("play send packets, err: %s", srs_error_desc(err).c_str());
srs_freep(err);
}
for (int i = 0; i < msg_count; i++) { for (int i = 0; i < msg_count; i++) {
SrsRtpPacket2* pkt = pkts[i]; SrsRtpPacket2* pkt = pkts[i];
srs_freep(pkt); srs_freep(pkt);
} }
pkts.clear(); pkts.clear();
}
// Stat for performance analysis. // Stat for performance analysis.
if (!stat_enabled) { if (!stat_enabled) {
@ -547,17 +555,18 @@ srs_error_t SrsRtcPlayStream::send_packets(SrsRtcStream* source, const vector<Sr
// For audio, we transcoded AAC to opus in extra payloads. // For audio, we transcoded AAC to opus in extra payloads.
if (pkt->is_audio()) { if (pkt->is_audio()) {
SrsRtcAudioSendTrack* audio_track = audio_tracks_[pkt->header.get_ssrc()];
// TODO: FIXME: Any simple solution? // TODO: FIXME: Any simple solution?
SrsRtcAudioSendTrack* audio_track = audio_tracks_[pkt->header.get_ssrc()];
if ((err = audio_track->on_rtp(pkt, info)) != srs_success) { if ((err = audio_track->on_rtp(pkt, info)) != srs_success) {
return srs_error_wrap(err, "audio_track on rtp"); return srs_error_wrap(err, "audio track");
} }
// TODO: FIXME: Padding audio to the max payload in RTP packets. // TODO: FIXME: Padding audio to the max payload in RTP packets.
} else { } else {
SrsRtcVideoSendTrack* video_track = video_tracks_[pkt->header.get_ssrc()];
// TODO: FIXME: Any simple solution? // TODO: FIXME: Any simple solution?
SrsRtcVideoSendTrack* video_track = video_tracks_[pkt->header.get_ssrc()];
if ((err = video_track->on_rtp(pkt, info)) != srs_success) { if ((err = video_track->on_rtp(pkt, info)) != srs_success) {
return srs_error_wrap(err, "audio_track on rtp"); return srs_error_wrap(err, "video track");
} }
} }

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

@ -1867,6 +1867,7 @@ srs_error_t SrsRtcAudioSendTrack::on_rtp(SrsRtpPacket2* pkt, SrsRtcPlayStreamSta
session_->stat_->nn_out_audios++; session_->stat_->nn_out_audios++;
// track level statistic // track level statistic
// TODO: FIXME: if send packets failed, statistic is no correct.
statistic_->packets++; statistic_->packets++;
statistic_->bytes += pkt->nb_bytes(); statistic_->bytes += pkt->nb_bytes();
@ -1922,6 +1923,7 @@ srs_error_t SrsRtcVideoSendTrack::on_rtp(SrsRtpPacket2* pkt, SrsRtcPlayStreamSta
session_->stat_->nn_out_videos++; session_->stat_->nn_out_videos++;
// track level statistic // track level statistic
// TODO: FIXME: if send packets failed, statistic is no correct.
statistic->packets++; statistic->packets++;
statistic->bytes += pkt->nb_bytes(); statistic->bytes += pkt->nb_bytes();