Merge branch 'develop' into feature/rtc

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 && 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);
-}
+}

trunk/src/app/srs_app_statistic.cpp

@@ -47,7 +47,7 @@ int64_t srs_generate_id()
 
 SrsStatisticVhost::SrsStatisticVhost()
 {
-    id = 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 = srs_generate_id();
+    id = srs_int2str(srs_generate_id());
     vhost = NULL;
     active = false;