From 2295ebb34610c3f416806a803b8f10fd3cc7eb9c Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 27 Apr 2014 14:23:21 +0800 Subject: [PATCH] remove the edge message flag, use directly send mode --- trunk/src/app/srs_app_edge.cpp | 6 ------ trunk/src/app/srs_app_edge.hpp | 1 - 2 files changed, 7 deletions(-) diff --git a/trunk/src/app/srs_app_edge.cpp b/trunk/src/app/srs_app_edge.cpp index b2d7f7241..811928ec2 100644 --- a/trunk/src/app/srs_app_edge.cpp +++ b/trunk/src/app/srs_app_edge.cpp @@ -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() diff --git a/trunk/src/app/srs_app_edge.hpp b/trunk/src/app/srs_app_edge.hpp index 80e95ffec..9be32a525 100644 --- a/trunk/src/app/srs_app_edge.hpp +++ b/trunk/src/app/srs_app_edge.hpp @@ -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;