Merge branch '4.0release' into develop

README.md

@@ -202,6 +202,7 @@ For previous versions, please read:
 
 ## V3 changes
 
+* v3.0, 2020-09-14, Prevent stop ingest for multiple times. 3.0.143
 * v3.0, 2020-09-10, RTC: Change SO_REUSEPORT fail to warning. 3.0.142
 * <strong>v3.0, 2020-06-27, [3.0 release0(3.0.141)][r3.0r0] released. 122674 lines.</strong>
 * v3.0, 2020-03-30, For [#1672][bug #1672], fix dvr close file failed bug. 3.0.140

trunk/src/app/srs_app_edge.cpp

@@ -691,11 +691,13 @@ void SrsPlayEdge::on_all_client_stop()
     // when all client disconnected,
     // and edge is ingesting origin stream, abort it.
     if (state == SrsEdgeStatePlay || state == SrsEdgeStateIngestConnected) {
-        ingester->stop();
-        
         SrsEdgeState pstate = state;
+        state = SrsEdgeStateIngestStopping;
+
+        ingester->stop();
+
         state = SrsEdgeStateInit;
-        srs_trace("edge change from %d to state %d (init).", pstate, state);
+        srs_trace("edge change from %d to %d then %d (init).", pstate, SrsEdgeStateIngestStopping, state);
         
         return;
     }

trunk/src/app/srs_app_edge.hpp

@@ -56,9 +56,12 @@ enum SrsEdgeState
     SrsEdgeStatePlay = 100,
     // play stream from origin, ingest stream
     SrsEdgeStateIngestConnected = 101,
-    
+
     // For publish edge
     SrsEdgeStatePublish = 200,
+
+    // We are stopping edge ingesting.
+    SrsEdgeStateIngestStopping = 300,
 };
 
 // The state of edge from user, manual machine

trunk/src/core/srs_core_version3.hpp

@@ -24,6 +24,6 @@
 #ifndef SRS_CORE_VERSION3_HPP
 #define SRS_CORE_VERSION3_HPP
 
-#define SRS_VERSION3_REVISION 142
+#define SRS_VERSION3_REVISION 143
 
 #endif