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
winlin
2014-04-27 14:23:21 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
2295ebb34610c3f416806a803b8f10fd3cc7eb9c
2295ebb3
1 parent
5ddc7168
remove the edge message flag, use directly send mode
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
0 行增加
和
7 行删除
trunk/src/app/srs_app_edge.cpp
trunk/src/app/srs_app_edge.hpp
trunk/src/app/srs_app_edge.cpp
查看文件 @
2295ebb
...
...
@@ -313,7 +313,6 @@ SrsEdgeProxyContext::SrsEdgeProxyContext()
edge_io
=
NULL
;
edge_rtmp
=
NULL
;
edge_stfd
=
NULL
;
edge_got_message
=
false
;
origin_stream_id
=
0
;
origin_io
=
NULL
;
...
...
@@ -408,8 +407,6 @@ int SrsEdgeForwarder::proxy(SrsEdgeProxyContext* context)
context
->
origin_rtmp
->
set_recv_timeout
(
SRS_RECV_TIMEOUT_US
);
context
->
edge_rtmp
->
set_recv_timeout
(
SRS_RECV_TIMEOUT_US
);
context
->
edge_got_message
=
false
;
SrsPithyPrint
pithy_print
(
SRS_STAGE_EDGE
);
pollfd
fds
[
2
];
...
...
@@ -478,7 +475,6 @@ int SrsEdgeForwarder::proxy_origin_message(SrsEdgeProxyContext* context)
srs_assert
(
msg
);
if
(
msg
->
size
<=
0
||
!
context
->
edge_got_message
||
msg
->
header
.
is_set_chunk_size
()
||
msg
->
header
.
is_window_ackledgement_size
()
||
msg
->
header
.
is_ackledgement
()
...
...
@@ -511,8 +507,6 @@ int SrsEdgeForwarder::proxy_edge_message(SrsEdgeProxyContext* context)
srs_assert
(
msg
);
//context->edge_got_message = true;
if
(
msg
->
size
<=
0
||
msg
->
header
.
is_set_chunk_size
()
||
msg
->
header
.
is_window_ackledgement_size
()
...
...
trunk/src/app/srs_app_edge.hpp
查看文件 @
2295ebb
...
...
@@ -108,7 +108,6 @@ public:
st_netfd_t
edge_stfd
;
ISrsProtocolReaderWriter
*
edge_io
;
SrsRtmpServer
*
edge_rtmp
;
bool
edge_got_message
;
public
:
int
origin_stream_id
;
st_netfd_t
origin_stfd
;
...
...
请
注册
或
登录
后发表评论