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

fix the log cid display error, merge the publish recv thread log to publish connection.

Browse source
This commit is contained in:
winlin 2015-08-21 15:22:40 +08:00
parent 3c402cb908
commit c75f05c88b
9 changed files with 84 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,6 +90,8 @@ protected:
public:
SrsRecvThread(ISrsMessageHandler* msg_handler, SrsRtmpServer* rtmp_sdk, int timeout_ms);
virtual ~SrsRecvThread();
public:
virtual int cid();
public:
virtual int start();
virtual void stop();
@ -170,6 +172,9 @@ private:
// the error timeout cond
// @see https://github.com/simple-rtmp-server/srs/issues/244
st_cond_t error;
// merged context id.
int cid;
int ncid;
public:
SrsPublishRecvThread(SrsRtmpServer* rtmp_sdk,
SrsRequest* _req, int mr_sock_fd, int timeout_ms,
@ -182,6 +187,8 @@ public:
virtual int wait(int timeout_ms);
virtual int64_t nb_msgs();
virtual int error_code();
virtual void set_cid(int v);
virtual int get_cid();
public:
virtual int start();
virtual void stop();