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 #78 st joinable thread must be stop by other threads, 0.9.113

Browse source
This commit is contained in:
winlin 2014-05-23 17:23:33 +08:00
parent 6fba0db9b5
commit 0eb9e0af5b
14 changed files with 96 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/app/srs_app_edge.cpp
View file

@ -69,7 +69,7 @@ SrsEdgeIngester::SrsEdgeIngester()
origin_index = 0;
stream_id = 0;
stfd = NULL;
pthread = new SrsThread(this, SRS_EDGE_INGESTER_SLEEP_US);
pthread = new SrsThread(this, SRS_EDGE_INGESTER_SLEEP_US, true);
}
SrsEdgeIngester::~SrsEdgeIngester()
@ -344,7 +344,7 @@ SrsEdgeForwarder::SrsEdgeForwarder()
origin_index = 0;
stream_id = 0;
stfd = NULL;
pthread = new SrsThread(this, SRS_EDGE_FORWARDER_SLEEP_US);
pthread = new SrsThread(this, SRS_EDGE_FORWARDER_SLEEP_US, true);
queue = new SrsMessageQueue();
send_error_code = ERROR_SUCCESS;
}