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

Merge branch 'develop' into feature/rtc

Browse source
This commit is contained in:
winlin 2020-08-30 12:56:17 +08:00
commit 89279f181c
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/app/srs_app_gb28181.cpp
View file

@ -1810,7 +1810,7 @@ void SrsGb28181RtmpMuxer::close()
h264_pps = ""; h264_pps = "";
aac_specific_config = ""; aac_specific_config = "";
if (source_publish && !source){ if (source_publish && source){
source->on_unpublish(); source->on_unpublish();
} }
} }
@ -2400,4 +2400,4 @@ srs_error_t SrsGb28181Manger::query_sip_session(std::string id, SrsJsonArray* ar
} }
return sip_service->query_sip_session(id, arr); return sip_service->query_sip_session(id, arr);
} }

4
trunk/src/app/srs_app_statistic.cpp
View file

@ -47,7 +47,7 @@ int64_t srs_generate_id()
SrsStatisticVhost::SrsStatisticVhost() SrsStatisticVhost::SrsStatisticVhost()
{ {
id = srs_generate_id(); id = srs_int2str(srs_generate_id());
clk = new SrsWallClock(); clk = new SrsWallClock();
kbps = new SrsKbps(clk); kbps = new SrsKbps(clk);
@ -98,7 +98,7 @@ srs_error_t SrsStatisticVhost::dumps(SrsJsonObject* obj)
SrsStatisticStream::SrsStatisticStream() SrsStatisticStream::SrsStatisticStream()
{ {
id = srs_generate_id(); id = srs_int2str(srs_generate_id());
vhost = NULL; vhost = NULL;
active = false; active = false;