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 bug #235, pass timeout to recv thread.

Browse source
This commit is contained in:
winlin 2014-12-01 22:45:45 +08:00
parent 31eb9bf1c1
commit 0b631ee80d
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
trunk/src/app/srs_app_recv_thread.hpp
View file

@ -68,8 +68,9 @@ protected:
SrsThread* trd;
ISrsMessageHandler* handler;
SrsRtmpServer* rtmp;
int timeout;
public:
SrsRecvThread(ISrsMessageHandler* msg_handler, SrsRtmpServer* rtmp_sdk);
SrsRecvThread(ISrsMessageHandler* msg_handler, SrsRtmpServer* rtmp_sdk, int timeout_ms);
virtual ~SrsRecvThread();
public:
virtual int start();
@ -91,7 +92,7 @@ class SrsQueueRecvThread : virtual public ISrsMessageHandler, virtual public Srs
private:
std::vector<SrsMessage*> queue;
public:
SrsQueueRecvThread(SrsRtmpServer* rtmp_sdk);
SrsQueueRecvThread(SrsRtmpServer* rtmp_sdk, int timeout_ms);
virtual ~SrsQueueRecvThread();
public:
virtual bool empty();