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

Fixed HLS input VoD

Browse source
This commit is contained in:
Thulinma 2017-05-12 15:39:21 +02:00
parent d1ac837be2
commit 401c323564
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/input/input_hls.cpp
View file

@ -599,7 +599,7 @@ namespace Mist{
thisPacket.null(); thisPacket.null();
while (!hasPacket && config->is_active && nProxy.userClient.isAlive()){ while (!hasPacket && config->is_active && (needsLock() || nProxy.userClient.isAlive())){
if (playlists[currentPlaylist].isUrl()){ if (playlists[currentPlaylist].isUrl()){
endOfFile = playlists[currentPlaylist].atEnd(); endOfFile = playlists[currentPlaylist].atEnd();
@ -639,7 +639,7 @@ namespace Mist{
int playlistTime = reloadNext.at(currentPlaylist) - Util::bootSecs() - 1; int playlistTime = reloadNext.at(currentPlaylist) - Util::bootSecs() - 1;
if (playlistTime < segmentTime){ if (playlistTime < segmentTime){
while (playlistTime > 0 && nProxy.userClient.isAlive()){ while (playlistTime > 0 && (needsLock() || nProxy.userClient.isAlive())){
Util::wait(900); Util::wait(900);
nProxy.userClient.keepAlive(); nProxy.userClient.keepAlive();
playlistTime--; playlistTime--;
@ -959,7 +959,7 @@ namespace Mist{
int segmentTime = playlists[pListId].entries.front().timestamp - Util::bootSecs(); int segmentTime = playlists[pListId].entries.front().timestamp - Util::bootSecs();
if (segmentTime){ if (segmentTime){
--segmentTime; --segmentTime;
while (segmentTime > 1 && nProxy.userClient.isAlive()){ while (segmentTime > 1 && (needsLock() || nProxy.userClient.isAlive())){
Util::wait(1000); Util::wait(1000);
--segmentTime; --segmentTime;
continueNegotiate(); continueNegotiate();