hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed TS input not shutting down correctly, fixed issue when track is not properly filled

Browse source
This commit is contained in:
Thulinma 2018-02-08 13:08:54 +01:00
parent 106967515a
commit 3e6b7fc9e8
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/input/input_ts.cpp
View file

@ -71,7 +71,7 @@ void parseThread(void * ignored) {
Util::sleep(100); Util::sleep(100);
continue; continue;
} }
while (liveStream.hasPacket(tid)){ while (liveStream.hasPacket(tid) && (Util::bootSecs() - threadTimer[tid] < THREAD_TIMEOUT && cfgPointer->is_active && (!liveStream.isDataTrack(tid) || myProxy.userClient.isAlive()))){
liveStream.initializeMetadata(myMeta, tid); liveStream.initializeMetadata(myMeta, tid);
DTSC::Packet pack; DTSC::Packet pack;
liveStream.getPacket(tid, pack); liveStream.getPacket(tid, pack);
@ -79,6 +79,9 @@ void parseThread(void * ignored) {
myProxy.continueNegotiate(tid, myMeta, true); myProxy.continueNegotiate(tid, myMeta, true);
myProxy.bufferLivePacket(pack, myMeta); myProxy.bufferLivePacket(pack, myMeta);
} }
if (!pack){
Util::sleep(500);
}
} }
{ {
tthread::lock_guard<tthread::mutex> guard(threadClaimMutex); tthread::lock_guard<tthread::mutex> guard(threadClaimMutex);