diff --git a/CHANGELOG.md b/CHANGELOG.md index 8281dd12b..7f821eb27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ The changelog for SRS. ## SRS 4.0 Changelog +* v4.0, 2021-06-21, Fix [#2413](https://github.com/ossrs/srs/issues/2413), fix RTMP to RTC bug 4.0.130 * v4.0, 2021-06-20, Guess where FFmpeg is. 4.0.129 * v4.0, 2021-06-20, Fix [#1685](https://github.com/ossrs/srs/issues/1685), support RTC cross-build for armv7/armv8(aarch64). 4.0.128 * v4.0, 2021-06-17, Fix [#2214](https://github.com/ossrs/srs/issues/2214), remove detection for gmc and gmp. diff --git a/README.md b/README.md index b4546fc42..cc2c49675 100755 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@ ![](http://ossrs.net/gif/v1/sls.gif?site=github.com&path=/srs/develop) [![](https://circleci.com/gh/ossrs/srs/tree/develop.svg?style=svg&circle-token=1ef1d5b5b0cde6c8c282ed856a18199f9e8f85a9)](https://circleci.com/gh/ossrs/srs/tree/develop) [![](https://codecov.io/gh/ossrs/srs/branch/develop/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/develop) -[![](https://gitee.com/winlinvip/srs-wiki/raw/master/images/wechat-badge.png)](wiki/Contact#wechat) +[![](https://gitee.com/winlinvip/srs-wiki/raw/master/images/wechat-badge.png)](../../wikis/Contact#wechat) +[![](https://gitee.com/winlinvip/srs-wiki/raw/master/images/bbs.png)](http://bbs.ossrs.net) SRS/4.0，[Leo][release4]，是一个简单高效的实时视频服务器，支持RTMP/WebRTC/HLS/HTTP-FLV/SRT。 diff --git a/trunk/auto/setup_variables.sh b/trunk/auto/setup_variables.sh index 35aec4ce1..cf9b1a98b 100755 --- a/trunk/auto/setup_variables.sh +++ b/trunk/auto/setup_variables.sh @@ -17,7 +17,7 @@ else SRS_PLATFORM="${SRS_PLATFORM}-${GCC_VERSION}" fi # Use isolate cache for different SRS version. -SRS_PLATFORM="${SRS_PLATFORM}-SRS5" +SRS_PLATFORM="${SRS_PLATFORM}-SRS5-$(uname -m)" if [[ $SRS_CROSS_BUILD == YES ]]; then SRS_PLATFORM="${SRS_PLATFORM}-CROSSBUILD-$(echo $SRS_TOOL_CC|awk -F - '{print $1}')" diff --git a/trunk/research/console/en_index.html b/trunk/research/console/en_index.html index 9c0c28169..6c16c7d68 100644 --- a/trunk/research/console/en_index.html +++ b/trunk/research/console/en_index.html @@ -20,7 +20,7 @@ - +
diff --git a/trunk/research/console/ng_index.html b/trunk/research/console/ng_index.html index a7f3e16a4..7d17d2209 100644 --- a/trunk/research/console/ng_index.html +++ b/trunk/research/console/ng_index.html @@ -20,7 +20,7 @@ - +
diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index f0402f3f4..a91deda0e 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -455,22 +455,26 @@ void SrsRtcPlayStream::on_stream_change(SrsRtcSourceDescription* desc) // Refresh the relation for audio. // 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; + if (! audio_tracks_.empty()) { + uint32_t ssrc = desc->audio_track_desc_->ssrc_; + SrsRtcAudioSendTrack* track = audio_tracks_.begin()->second; - audio_tracks_.clear(); - audio_tracks_.insert(make_pair(ssrc, track)); + audio_tracks_.clear(); + audio_tracks_.insert(make_pair(ssrc, track)); + } } // Refresh the relation for video. // 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; + if (! video_tracks_.empty()) { + SrsRtcTrackDescription* vdesc = desc->video_track_descs_.at(0); + uint32_t ssrc = vdesc->ssrc_; + SrsRtcVideoSendTrack* track = video_tracks_.begin()->second; - video_tracks_.clear(); - video_tracks_.insert(make_pair(ssrc, track)); + video_tracks_.clear(); + video_tracks_.insert(make_pair(ssrc, track)); + } } } diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index 477503343..dfde9d483 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 129 +#define VERSION_REVISION 130 #endif