mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Merge branch 'develop' into feature/rtc
This commit is contained in:
commit
783029778c
4 changed files with 11 additions and 5 deletions
|
@ -55,9 +55,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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue