From 1f0b5f04954b1a987946508a7c91a280197e98bb Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 20 Jun 2021 19:39:26 +0800 Subject: [PATCH 1/7] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 390cf8b64..53b6fd186 100755 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ![](http://ossrs.net/gif/v1/sls.gif?site=github.com&path=/srs/4.0release) [![](https://circleci.com/gh/ossrs/srs/tree/4.0release.svg?style=svg&circle-token=1ef1d5b5b0cde6c8c282ed856a18199f9e8f85a9)](https://circleci.com/gh/ossrs/srs/tree/4.0release) [![](https://codecov.io/gh/ossrs/srs/branch/4.0release/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/4.0release) -[![](https://cloud.githubusercontent.com/assets/2777660/22814959/c51cbe72-ef92-11e6-81cc-32b657b285d5.png)](https://github.com/ossrs/srs/wiki/v4_CN_Contact#wechat) +[![](https://gitee.com/winlinvip/srs-wiki/raw/master/images/wechat-badge.png)](wiki/Contact#wechat) SRS/4.0，[Leo][release4]，是一个简单高效的实时视频服务器，支持RTMP/WebRTC/HLS/HTTP-FLV/SRT。 From bc35a1fc4c14d0b4eeec6f4180b3f51a27f1a274 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 20 Jun 2021 19:43:02 +0800 Subject: [PATCH 2/7] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 53b6fd186..534fd5ca0 100755 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ![](http://ossrs.net/gif/v1/sls.gif?site=github.com&path=/srs/4.0release) [![](https://circleci.com/gh/ossrs/srs/tree/4.0release.svg?style=svg&circle-token=1ef1d5b5b0cde6c8c282ed856a18199f9e8f85a9)](https://circleci.com/gh/ossrs/srs/tree/4.0release) [![](https://codecov.io/gh/ossrs/srs/branch/4.0release/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/4.0release) -[![](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)](../../wiki/Contact#wechat) SRS/4.0，[Leo][release4]，是一个简单高效的实时视频服务器，支持RTMP/WebRTC/HLS/HTTP-FLV/SRT。 From fcb2b3da2c78413b26ca83cdbd7ad9a727bc3d30 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 20 Jun 2021 19:44:39 +0800 Subject: [PATCH 3/7] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 534fd5ca0..f3d19dc9d 100755 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ![](http://ossrs.net/gif/v1/sls.gif?site=github.com&path=/srs/4.0release) [![](https://circleci.com/gh/ossrs/srs/tree/4.0release.svg?style=svg&circle-token=1ef1d5b5b0cde6c8c282ed856a18199f9e8f85a9)](https://circleci.com/gh/ossrs/srs/tree/4.0release) [![](https://codecov.io/gh/ossrs/srs/branch/4.0release/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/4.0release) -[![](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) SRS/4.0，[Leo][release4]，是一个简单高效的实时视频服务器，支持RTMP/WebRTC/HLS/HTTP-FLV/SRT。 From 2376c4cebbe8a9b3386e866a39f95afd4a1c78ca Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 20 Jun 2021 20:17:25 +0800 Subject: [PATCH 4/7] Add BBS link --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f3d19dc9d..02ccd06fd 100755 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ [![](https://circleci.com/gh/ossrs/srs/tree/4.0release.svg?style=svg&circle-token=1ef1d5b5b0cde6c8c282ed856a18199f9e8f85a9)](https://circleci.com/gh/ossrs/srs/tree/4.0release) [![](https://codecov.io/gh/ossrs/srs/branch/4.0release/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/4.0release) [![](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。 From 3aba2f3479c417031cc2270d90c793499b75092e Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 21 Jun 2021 14:05:46 +0800 Subject: [PATCH 5/7] Add machine to build dir --- trunk/auto/setup_variables.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/auto/setup_variables.sh b/trunk/auto/setup_variables.sh index ee111445a..eea52a0ba 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}-SRS4" +SRS_PLATFORM="${SRS_PLATFORM}-SRS4-$(uname -m)" if [[ $SRS_CROSS_BUILD == YES ]]; then SRS_PLATFORM="${SRS_PLATFORM}-CROSSBUILD-$(echo $SRS_TOOL_CC|awk -F - '{print $1}')" From 1347da81f868727a94e3be8f748896046572762e Mon Sep 17 00:00:00 2001 From: john Date: Mon, 21 Jun 2021 14:35:37 +0800 Subject: [PATCH 6/7] Check audio/video track when rtc stream updated (#2418) --- trunk/src/app/srs_app_rtc_conn.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 6359334e3..4c17c8820 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: FIMXE: 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)); + } } } From 5906345a97be71e3192982b448d64c8d65787314 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 21 Jun 2021 14:37:41 +0800 Subject: [PATCH 7/7] Fix #2413, fix RTMP to RTC bug 4.0.130 --- CHANGELOG.md | 1 + trunk/src/core/srs_core_version4.hpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5489f2a60..003c31362 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,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/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