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

implements the proxy for edge publish mode

Browse source
This commit is contained in:
winlin 2014-04-27 11:11:15 +08:00
parent ec96072472
commit 79c9c6dcb7
7 changed files with 187 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

26
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -42,6 +42,7 @@ using namespace std;
#include <srs_app_bandwidth.hpp>
#include <srs_app_socket.hpp>
#include <srs_app_http_hooks.hpp>
#include <srs_app_edge.hpp>
// when stream is busy, for example, streaming is already
// publishing, when a new client to request to publish,
@ -332,6 +333,15 @@ int SrsRtmpConn::stream_service_cycle()
srs_error("start to publish stream failed. ret=%d", ret);
return ret;
}
SrsEdgeProxyContext context;
context.edge_io = skt;
context.edge_stream_id = res->stream_id;
context.edge_rtmp = rtmp;
if (vhost_is_edge) {
return source->on_edge_proxy_publish(&context);
}
if ((ret = on_publish()) != ERROR_SUCCESS) {
srs_error("http hook on_publish failed. ret=%d", ret);
return ret;
@ -345,10 +355,26 @@ int SrsRtmpConn::stream_service_cycle()
case SrsRtmpConnFlashPublish: {
srs_verbose("flash start to publish stream %s.", req->stream.c_str());
if (vhost_is_edge) {
if ((ret = source->on_edge_start_publish()) != ERROR_SUCCESS) {
srs_error("notice edge start publish stream failed. ret=%d", ret);
return ret;
}
}
if ((ret = rtmp->start_flash_publish(res->stream_id)) != ERROR_SUCCESS) {
srs_error("flash start to publish stream failed. ret=%d", ret);
return ret;
}
SrsEdgeProxyContext context;
context.edge_io = skt;
context.edge_stream_id = res->stream_id;
context.edge_rtmp = rtmp;
if (vhost_is_edge) {
return source->on_edge_proxy_publish(&context);
}
if ((ret = on_publish()) != ERROR_SUCCESS) {
srs_error("http hook on_publish failed. ret=%d", ret);
return ret;