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

Fixed recstart/recstop values in the past

Browse source
This commit is contained in:
Thulinma 2017-10-25 20:56:31 +02:00
parent e4827ce615
commit 014eed32e8
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/output/output.cpp
View file

@ -857,7 +857,7 @@ namespace Mist{
} }
if (targetParams.count("recstop")){ if (targetParams.count("recstop")){
long long endRec = atoll(targetParams["recstop"].c_str()); long long endRec = atoll(targetParams["recstop"].c_str());
if (endRec < startTime()){ if (endRec < 0 || endRec < startTime()){
FAIL_MSG("Entire recording range is in the past"); FAIL_MSG("Entire recording range is in the past");
onFail(); onFail();
return; return;
@ -867,12 +867,13 @@ namespace Mist{
if (targetParams.count("recstart") && atoll(targetParams["recstart"].c_str()) != 0){ if (targetParams.count("recstart") && atoll(targetParams["recstart"].c_str()) != 0){
unsigned long int mainTrack = getMainSelectedTrack(); unsigned long int mainTrack = getMainSelectedTrack();
long long startRec = atoll(targetParams["recstart"].c_str()); long long startRec = atoll(targetParams["recstart"].c_str());
if (startRec > myMeta.tracks[mainTrack].lastms){ if (startRec > 0 && startRec > myMeta.tracks[mainTrack].lastms){
if (myMeta.vod){ if (myMeta.vod){
FAIL_MSG("Recording start past end of non-live source"); FAIL_MSG("Recording start past end of non-live source");
onFail(); onFail();
return; return;
} }
INFO_MSG("Waiting for stream to reach recording starting point");
long unsigned int streamAvail = myMeta.tracks[mainTrack].lastms; long unsigned int streamAvail = myMeta.tracks[mainTrack].lastms;
long unsigned int lastUpdated = Util::getMS(); long unsigned int lastUpdated = Util::getMS();
while (Util::getMS() - lastUpdated < 5000 && startRec > streamAvail && keepGoing()){ while (Util::getMS() - lastUpdated < 5000 && startRec > streamAvail && keepGoing()){
@ -885,7 +886,7 @@ namespace Mist{
} }
} }
} }
if (startRec < startTime()){ if (startRec < 0 || startRec < startTime()){
WARN_MSG("Record begin at %llu ms not available, starting at %llu ms instead", startRec, startTime()); WARN_MSG("Record begin at %llu ms not available, starting at %llu ms instead", startRec, startTime());
startRec = startTime(); startRec = startTime();
} }