From 52644f50c9c0cd4db9a6c44bc3b06cfa0d8e3676 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 4 Apr 2021 18:50:59 +0800 Subject: [PATCH] SquashSRS4: Fix republish bug --- trunk/src/app/srs_app_rtc_conn.cpp | 8 ++++---- trunk/src/core/srs_core_version4.hpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index fc94c6fdc..a96b12358 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -469,8 +469,8 @@ srs_error_t SrsRtcPlayStream::initialize(SrsRequest* req, std::mapaudio_track_desc_ && audio_tracks_.size() == 1) { + // TODO: FIXME: Match by label? + if (desc && desc->audio_track_desc_ && audio_tracks_.size() == 1) { uint32_t ssrc = desc->audio_track_desc_->ssrc_; SrsRtcAudioSendTrack* track = audio_tracks_.begin()->second; @@ -479,8 +479,8 @@ void SrsRtcPlayStream::on_stream_change(SrsRtcStreamDescription* desc) } // Refresh the relation for video. - // TODO: FIMXE: Match by label? - if (desc->video_track_descs_.size() == 1 && desc->video_track_descs_.size() == 1) { + // TODO: FIXME: Match by label? + if (desc && desc->video_track_descs_.size() == 1 && 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; diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index 42f973eaa..54ba852bf 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -26,6 +26,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 88 +#define VERSION_REVISION 89 #endif