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 '3.0release' into 4.0release

Browse source
This commit is contained in:
winlin 2020-09-14 20:52:11 +08:00
commit 991ef94535
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/app/srs_app_edge.cpp
View file

@ -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;
}

5
trunk/src/app/srs_app_edge.hpp
View file

@ -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

2
trunk/src/core/srs_core_version3.hpp
View file

@ -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