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

for #742, refine the rtmp conn, use info as data cluster.

Browse source
This commit is contained in:
winlin 2017-01-23 17:12:04 +08:00
parent 39aee2b318
commit 79def81792
4 changed files with 111 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -254,15 +254,13 @@ void SrsQueueRecvThread::on_stop()
SrsPublishRecvThread::SrsPublishRecvThread(
SrsRtmpServer* rtmp_sdk,
SrsRequest* _req, int mr_sock_fd, int timeout_ms,
SrsRtmpConn* conn, SrsSource* source, bool is_fmle, bool is_edge
SrsRtmpConn* conn, SrsSource* source
): trd(this, rtmp_sdk, timeout_ms)
{
rtmp = rtmp_sdk;
_conn = conn;
_source = source;
_is_fmle = is_fmle;
_is_edge = is_edge;
recv_error_code = ERROR_SUCCESS;
_nb_msgs = 0;
@ -351,7 +349,7 @@ int SrsPublishRecvThread::consume(SrsCommonMessage* msg)
srs_update_system_time_ms(), msg->header.timestamp, msg->size);
// the rtmp connection will handle this message
ret = _conn->handle_publish_message(_source, msg, _is_fmle, _is_edge);
ret = _conn->handle_publish_message(_source, msg);
// must always free it,
// the source will copy it if need to use.