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

refine code: 删除srs_app_edge中的user_stat相关代码。因为没有任何作用。

Browse source
This commit is contained in:
zhengfl 2015-07-09 10:08:17 +08:00
parent 0aed408855
commit f6a2cea716
2 changed files with 1 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
trunk/src/app/srs_app_edge.cpp Normal file → Executable file
View file

@ -705,7 +705,6 @@ int SrsEdgeForwarder::connect_app(string ep_server, string ep_port)
SrsPlayEdge::SrsPlayEdge() SrsPlayEdge::SrsPlayEdge()
{ {
state = SrsEdgeStateInit; state = SrsEdgeStateInit;
user_state = SrsEdgeUserStateInit;
ingester = new SrsEdgeIngester(); ingester = new SrsEdgeIngester();
} }
@ -729,14 +728,6 @@ int SrsPlayEdge::on_client_play()
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
// error state.
if (user_state != SrsEdgeUserStateInit) {
ret = ERROR_RTMP_EDGE_PLAY_STATE;
srs_error("invalid state for client to pull stream on edge. "
"state=%d, user_state=%d, ret=%d", state, user_state, ret);
return ret;
}
// start ingest when init state. // start ingest when init state.
if (state == SrsEdgeStateInit) { if (state == SrsEdgeStateInit) {
state = SrsEdgeStatePlay; state = SrsEdgeStatePlay;
@ -782,7 +773,6 @@ int SrsPlayEdge::on_ingest_play()
SrsPublishEdge::SrsPublishEdge() SrsPublishEdge::SrsPublishEdge()
{ {
state = SrsEdgeStateInit; state = SrsEdgeStateInit;
user_state = SrsEdgeUserStateInit;
forwarder = new SrsEdgeForwarder(); forwarder = new SrsEdgeForwarder();
} }
@ -816,19 +806,11 @@ int SrsPublishEdge::on_client_publish()
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
// error state.
if (user_state != SrsEdgeUserStateInit) {
ret = ERROR_RTMP_EDGE_PUBLISH_STATE;
srs_error("invalid state for client to publish stream on edge. "
"state=%d, user_state=%d, ret=%d", state, user_state, ret);
return ret;
}
// error when not init state. // error when not init state.
if (state != SrsEdgeStateInit) { if (state != SrsEdgeStateInit) {
ret = ERROR_RTMP_EDGE_PUBLISH_STATE; ret = ERROR_RTMP_EDGE_PUBLISH_STATE;
srs_error("invalid state for client to publish stream on edge. " srs_error("invalid state for client to publish stream on edge. "
"state=%d, user_state=%d, ret=%d", state, user_state, ret); "state=%d, ret=%d", state, ret);
return ret; return ret;
} }

2
trunk/src/app/srs_app_edge.hpp Normal file → Executable file
View file

@ -163,7 +163,6 @@ class SrsPlayEdge
{ {
private: private:
SrsEdgeState state; SrsEdgeState state;
SrsEdgeUserState user_state;
SrsEdgeIngester* ingester; SrsEdgeIngester* ingester;
public: public:
SrsPlayEdge(); SrsPlayEdge();
@ -198,7 +197,6 @@ class SrsPublishEdge
{ {
private: private:
SrsEdgeState state; SrsEdgeState state;
SrsEdgeUserState user_state;
SrsEdgeForwarder* forwarder; SrsEdgeForwarder* forwarder;
public: public:
SrsPublishEdge(); SrsPublishEdge();