From 55426c6331fdc56348fab68da59a447f61664b2f Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 6 Apr 2021 10:51:42 +0800 Subject: [PATCH 1/2] SquashSRS4: Fix RTC connection dispose bug --- trunk/src/app/srs_app_rtc_conn.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index a96b12358..4aa2de057 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -2139,6 +2139,11 @@ srs_error_t SrsRtcConnection::on_connection_established() { srs_error_t err = srs_success; + // Ignore if disposing. + if (disposing_) { + return err; + } + // If DTLS done packet received many times, such as ARQ, ignore. if(ESTABLISHED == state_) { return err; From 323306149db15a96ebc09422c47a286d7e6a6d00 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 6 Apr 2021 11:22:12 +0800 Subject: [PATCH 2/2] SquashSRS4: Eliminate the dup code --- trunk/src/app/srs_app_rtc_conn.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 4aa2de057..8791a3f37 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -479,8 +479,8 @@ void SrsRtcPlayStream::on_stream_change(SrsRtcStreamDescription* desc) } // Refresh the relation for video. - // TODO: FIXME: Match by label? - if (desc && desc->video_track_descs_.size() == 1 && desc->video_track_descs_.size() == 1) { + // TODO: FIMXE: Match by label? + if (desc && desc->video_track_descs_.size() == 1) { SrsRtcTrackDescription* vdesc = desc->video_track_descs_.at(0); uint32_t ssrc = vdesc->ssrc_; SrsRtcVideoSendTrack* track = video_tracks_.begin()->second;