From 120033e0a2eed7e699936f741722a8dc095f59cc Mon Sep 17 00:00:00 2001 From: zhengfl Date: Wed, 8 Jul 2015 11:47:34 +0800 Subject: [PATCH] =?UTF-8?q?fix=20#437=20=20=20=20=20edge=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E9=87=8D=E6=96=B0=E4=BB=8E=E6=BA=90=E7=AB=99=E6=8B=89?= =?UTF-8?q?=E6=B5=81=E6=97=B6=EF=BC=8C=E5=AF=BC=E8=87=B4forwarders?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- trunk/src/app/srs_app_edge.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) mode change 100644 => 100755 trunk/src/app/srs_app_edge.cpp diff --git a/trunk/src/app/srs_app_edge.cpp b/trunk/src/app/srs_app_edge.cpp old mode 100644 new mode 100755 index ef57a237b..8014e75bd --- a/trunk/src/app/srs_app_edge.cpp +++ b/trunk/src/app/srs_app_edge.cpp @@ -94,6 +94,13 @@ int SrsEdgeIngester::initialize(SrsSource* source, SrsPlayEdge* edge, SrsRequest int SrsEdgeIngester::start() { + int ret = ERROR_SUCCESS; + + if ((ret = _source->on_publish()) != ERROR_SUCCESS) { + srs_error("edge pull stream then publish to edge failed. ret=%d", ret); + return ret; + } + return pthread->start(); } @@ -114,7 +121,8 @@ void SrsEdgeIngester::stop() int SrsEdgeIngester::cycle() { int ret = ERROR_SUCCESS; - + _source->on_source_id_changed(_srs_context->get_id()); + std::string ep_server, ep_port; if ((ret = connect_server(ep_server, ep_port)) != ERROR_SUCCESS) { return ret; @@ -144,11 +152,6 @@ int SrsEdgeIngester::cycle() return ret; } - if ((ret = _source->on_publish()) != ERROR_SUCCESS) { - srs_error("edge pull stream then publish to edge failed. ret=%d", ret); - return ret; - } - if ((ret = _edge->on_ingest_play()) != ERROR_SUCCESS) { return ret; }