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

Fix #2366, bug when disabled gb28181.

Browse source
This commit is contained in:
chenhaibo 2021-05-20 15:48:34 +08:00 • committed by winlin
parent 8f304b94ec
commit bd506da070
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AUTHORS.txt
View file

@ -73,7 +73,7 @@ CONTRIBUTORS ordered by first contribution.
* liulichuan<liulichuan@kuaishou.com> * liulichuan<liulichuan@kuaishou.com>
* yapingcat<caoyapingneu@163.com> * yapingcat<caoyapingneu@163.com>
* chenchengbin<chenchengbin@yy.com> * chenchengbin<chenchengbin@yy.com>
* chenhaibo<chenhaibo@RD-CHB-0476-01> * chenhaibo<nmgchenhaibo@foxmail.com>
* jasongwq<jasongwq@gmail.com> * jasongwq<jasongwq@gmail.com>
* xialixin<xialixin@kanzhun.com> * xialixin<xialixin@kanzhun.com>
* yinjiaoyuan<yinjiaoyuan@163.com> * yinjiaoyuan<yinjiaoyuan@163.com>

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

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