Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
zhengfl
2015-07-09 10:08:17 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f6a2cea7162b0254cea250a072804eb7a21dfab7
f6a2cea7
1 parent
0aed4088
refine code: 删除srs_app_edge中的user_stat相关代码。因为没有任何作用。
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
1 行增加
和
21 行删除
trunk/src/app/srs_app_edge.cpp
trunk/src/app/srs_app_edge.hpp
trunk/src/app/srs_app_edge.cpp
100644 → 100755
查看文件 @
f6a2cea
...
...
@@ -705,7 +705,6 @@ int SrsEdgeForwarder::connect_app(string ep_server, string ep_port)
SrsPlayEdge
::
SrsPlayEdge
()
{
state
=
SrsEdgeStateInit
;
user_state
=
SrsEdgeUserStateInit
;
ingester
=
new
SrsEdgeIngester
();
}
...
...
@@ -729,14 +728,6 @@ int SrsPlayEdge::on_client_play()
{
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.
if
(
state
==
SrsEdgeStateInit
)
{
state
=
SrsEdgeStatePlay
;
...
...
@@ -782,7 +773,6 @@ int SrsPlayEdge::on_ingest_play()
SrsPublishEdge
::
SrsPublishEdge
()
{
state
=
SrsEdgeStateInit
;
user_state
=
SrsEdgeUserStateInit
;
forwarder
=
new
SrsEdgeForwarder
();
}
...
...
@@ -816,19 +806,11 @@ int SrsPublishEdge::on_client_publish()
{
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.
if
(
state
!=
SrsEdgeStateInit
)
{
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
);
"state=%d,
ret=%d"
,
state
,
ret
);
return
ret
;
}
...
...
trunk/src/app/srs_app_edge.hpp
100644 → 100755
查看文件 @
f6a2cea
...
...
@@ -163,7 +163,6 @@ class SrsPlayEdge
{
private
:
SrsEdgeState
state
;
SrsEdgeUserState
user_state
;
SrsEdgeIngester
*
ingester
;
public
:
SrsPlayEdge
();
...
...
@@ -198,7 +197,6 @@ class SrsPublishEdge
{
private
:
SrsEdgeState
state
;
SrsEdgeUserState
user_state
;
SrsEdgeForwarder
*
forwarder
;
public
:
SrsPublishEdge
();
...
...
请
注册
或
登录
后发表评论