From 401c323564b079dce657037bec5a6b754395f7b3 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Fri, 12 May 2017 15:39:21 +0200 Subject: [PATCH] Fixed HLS input VoD --- src/input/input_hls.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/input/input_hls.cpp b/src/input/input_hls.cpp index 06643df0..646a735d 100644 --- a/src/input/input_hls.cpp +++ b/src/input/input_hls.cpp @@ -599,7 +599,7 @@ namespace Mist{ thisPacket.null(); - while (!hasPacket && config->is_active && nProxy.userClient.isAlive()){ + while (!hasPacket && config->is_active && (needsLock() || nProxy.userClient.isAlive())){ if (playlists[currentPlaylist].isUrl()){ endOfFile = playlists[currentPlaylist].atEnd(); @@ -639,7 +639,7 @@ namespace Mist{ int playlistTime = reloadNext.at(currentPlaylist) - Util::bootSecs() - 1; if (playlistTime < segmentTime){ - while (playlistTime > 0 && nProxy.userClient.isAlive()){ + while (playlistTime > 0 && (needsLock() || nProxy.userClient.isAlive())){ Util::wait(900); nProxy.userClient.keepAlive(); playlistTime--; @@ -959,7 +959,7 @@ namespace Mist{ int segmentTime = playlists[pListId].entries.front().timestamp - Util::bootSecs(); if (segmentTime){ --segmentTime; - while (segmentTime > 1 && nProxy.userClient.isAlive()){ + while (segmentTime > 1 && (needsLock() || nProxy.userClient.isAlive())){ Util::wait(1000); --segmentTime; continueNegotiate();