external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

Fix #2364: Live: Fail for stream busy if GB28181 is publishing.

Browse source
This commit is contained in:
Xiaoniu 2021-05-19 20:21:20 +08:00 committed by winlin
parent 36b769deee
commit 75607d0723
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -961,6 +961,15 @@ srs_error_t SrsRtmpConn::acquire_publish(SrsLiveSource* source)
SrsRequest* req = info->req; SrsRequest* req = info->req;
// @see https://github.com/ossrs/srs/issues/2364
// Check whether GB28181 stream is busy.
#if defined(SRS_GB28181)
SrsGb28181RtmpMuxer* gb28181 = _srs_gb28181->fetch_rtmpmuxer(req->stream);
if (gb28181 != NULL) {
return srs_error_new(ERROR_SYSTEM_STREAM_BUSY, "gb28181 stream %s busy", req->get_stream_url().c_str());
}
#endif
// Check whether RTC stream is busy. // Check whether RTC stream is busy.
#ifdef SRS_RTC #ifdef SRS_RTC
SrsRtcSource *rtc = NULL; SrsRtcSource *rtc = NULL;