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

remove the edge message flag, use directly send mode

Browse source
This commit is contained in:
winlin 2014-04-27 14:23:21 +08:00
parent 5ddc71685b
commit 2295ebb346
2 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -313,7 +313,6 @@ SrsEdgeProxyContext::SrsEdgeProxyContext()
edge_io = NULL; edge_io = NULL;
edge_rtmp = NULL; edge_rtmp = NULL;
edge_stfd = NULL; edge_stfd = NULL;
edge_got_message = false;
origin_stream_id = 0; origin_stream_id = 0;
origin_io = NULL; origin_io = NULL;
@ -408,8 +407,6 @@ int SrsEdgeForwarder::proxy(SrsEdgeProxyContext* context)
context->origin_rtmp->set_recv_timeout(SRS_RECV_TIMEOUT_US); context->origin_rtmp->set_recv_timeout(SRS_RECV_TIMEOUT_US);
context->edge_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); SrsPithyPrint pithy_print(SRS_STAGE_EDGE);
pollfd fds[2]; pollfd fds[2];
@ -478,7 +475,6 @@ int SrsEdgeForwarder::proxy_origin_message(SrsEdgeProxyContext* context)
srs_assert(msg); srs_assert(msg);
if (msg->size <= 0 if (msg->size <= 0
|| !context->edge_got_message
|| msg->header.is_set_chunk_size() || msg->header.is_set_chunk_size()
|| msg->header.is_window_ackledgement_size() || msg->header.is_window_ackledgement_size()
|| msg->header.is_ackledgement() || msg->header.is_ackledgement()
@ -511,8 +507,6 @@ int SrsEdgeForwarder::proxy_edge_message(SrsEdgeProxyContext* context)
srs_assert(msg); srs_assert(msg);
//context->edge_got_message = true;
if (msg->size <= 0 if (msg->size <= 0
|| msg->header.is_set_chunk_size() || msg->header.is_set_chunk_size()
|| msg->header.is_window_ackledgement_size() || msg->header.is_window_ackledgement_size()

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

@ -108,7 +108,6 @@ public:
st_netfd_t edge_stfd; st_netfd_t edge_stfd;
ISrsProtocolReaderWriter* edge_io; ISrsProtocolReaderWriter* edge_io;
SrsRtmpServer* edge_rtmp; SrsRtmpServer* edge_rtmp;
bool edge_got_message;
public: public:
int origin_stream_id; int origin_stream_id;
st_netfd_t origin_stfd; st_netfd_t origin_stfd;