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

refine code, the consumer always alive longer than queue recv thread.

Browse source
This commit is contained in:
winlin 2015-01-07 14:31:42 +08:00
parent 89a3cf9efe
commit a402ca7120
4 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -134,9 +134,10 @@ void SrsRecvThread::on_thread_stop()
handler->on_thread_stop();
}
SrsQueueRecvThread::SrsQueueRecvThread(SrsRtmpServer* rtmp_sdk, int timeout_ms)
SrsQueueRecvThread::SrsQueueRecvThread(SrsConsumer* consumer, SrsRtmpServer* rtmp_sdk, int timeout_ms)
: trd(this, rtmp_sdk, timeout_ms)
{
_consumer = consumer;
rtmp = rtmp_sdk;
recv_error_code = ERROR_SUCCESS;
_consumer = NULL;
@ -237,11 +238,6 @@ void SrsQueueRecvThread::on_thread_stop()
rtmp->set_auto_response(true);
}
void SrsQueueRecvThread::set_consumer(SrsConsumer *consumer)
{
_consumer = consumer;
}
SrsPublishRecvThread::SrsPublishRecvThread(
SrsRtmpServer* rtmp_sdk,
SrsRequest* _req, int mr_sock_fd, int timeout_ms,