external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Squash: Move GB28181 to feature/gb28181. 5.0.4

Browse source
This commit is contained in:
winlin 2021-06-16 13:40:54 +08:00
parent 49826081b1
commit efdbf37255
39 changed files with 50 additions and 9885 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -943,17 +943,6 @@ srs_error_t SrsRtmpConn::acquire_publish(SrsLiveSource* source)
srs_error_t err = srs_success;
SrsRequest* req = info->req;
// @see https://github.com/ossrs/srs/issues/2364
// Check whether GB28181 stream is busy.
#if defined(SRS_GB28181)
if (_srs_gb28181 != NULL) {
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.
#ifdef SRS_RTC