From 7e5572c5e1fbcdf52bdbfe7de51b1e1cd6eb442f Mon Sep 17 00:00:00 2001 From: jasongwq Date: Sat, 29 Aug 2020 00:27:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?FIX=EF=BC=9AWhen=2028181=20stream=20stopped?= =?UTF-8?q?=EF=BC=8CStream=20API=20does=20not=20remove=20it?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- trunk/src/app/srs_app_gb28181.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/src/app/srs_app_gb28181.cpp b/trunk/src/app/srs_app_gb28181.cpp index ec0b7022b..6414999ae 100644 --- a/trunk/src/app/srs_app_gb28181.cpp +++ b/trunk/src/app/srs_app_gb28181.cpp @@ -1810,7 +1810,7 @@ void SrsGb28181RtmpMuxer::close() h264_pps = ""; aac_specific_config = ""; - if (source_publish && !source){ + if (source_publish && NULL!=source){ 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); -} \ No newline at end of file +} From 2f22a3d38b43089a4579415d5947ce5f33e31e46 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 30 Aug 2020 12:43:55 +0800 Subject: [PATCH 2/4] For #1926, refine code --- trunk/src/app/srs_app_gb28181.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/src/app/srs_app_gb28181.cpp b/trunk/src/app/srs_app_gb28181.cpp index 6414999ae..601385e61 100644 --- a/trunk/src/app/srs_app_gb28181.cpp +++ b/trunk/src/app/srs_app_gb28181.cpp @@ -1810,7 +1810,7 @@ void SrsGb28181RtmpMuxer::close() h264_pps = ""; aac_specific_config = ""; - if (source_publish && NULL!=source){ + if (source_publish && source){ source->on_unpublish(); } } From 794563145c452630000bed349cac643637453016 Mon Sep 17 00:00:00 2001 From: yapingcat Date: Wed, 12 Aug 2020 13:55:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8A=8Aint64=5Ft=E8=BD=AC=E6=88=90?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 通过http api 获取streams信息时id显示乱码，应该将int转化为字符串 --- trunk/src/app/srs_app_statistic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/src/app/srs_app_statistic.cpp b/trunk/src/app/srs_app_statistic.cpp index 6da79f2a2..083b3f456 100644 --- a/trunk/src/app/srs_app_statistic.cpp +++ b/trunk/src/app/srs_app_statistic.cpp @@ -47,7 +47,7 @@ int64_t srs_generate_id() SrsStatisticVhost::SrsStatisticVhost() { - id = srs_generate_id(); + id = std::to_string(srs_generate_id()); clk = new SrsWallClock(); kbps = new SrsKbps(clk); @@ -98,7 +98,7 @@ srs_error_t SrsStatisticVhost::dumps(SrsJsonObject* obj) SrsStatisticStream::SrsStatisticStream() { - id = srs_generate_id(); + id = std::to_string(srs_generate_id()); vhost = NULL; active = false; From 23577763cd95ce5b60cee176bcbfc014581406ae Mon Sep 17 00:00:00 2001 From: yapingcat Date: Wed, 12 Aug 2020 14:15:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=8Aint64=5Ft=E8=BD=AC=E6=88=90?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 通过http api 获取streams信息时id显示乱码，应该将int转化为字符串 --- trunk/src/app/srs_app_statistic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/src/app/srs_app_statistic.cpp b/trunk/src/app/srs_app_statistic.cpp index 083b3f456..a2324d31e 100644 --- a/trunk/src/app/srs_app_statistic.cpp +++ b/trunk/src/app/srs_app_statistic.cpp @@ -47,7 +47,7 @@ int64_t srs_generate_id() SrsStatisticVhost::SrsStatisticVhost() { - id = std::to_string(srs_generate_id()); + id = srs_int2str(srs_generate_id()); clk = new SrsWallClock(); kbps = new SrsKbps(clk); @@ -98,7 +98,7 @@ srs_error_t SrsStatisticVhost::dumps(SrsJsonObject* obj) SrsStatisticStream::SrsStatisticStream() { - id = std::to_string(srs_generate_id()); + id = srs_int2str(srs_generate_id()); vhost = NULL; active = false;