ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change logic for going to sleep to just have an image instead of using Ready() which looks for keyframe interval.

pull/3195/merge
Isaac Connor 2024-10-28 15:51:44 -04:00
parent 6fe9d9decb
commit 6cc423bf7a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/zmc.cpp
View File

@ -293,9 +293,11 @@ int main(int argc, char *argv[]) {
if (monitors[i]->Capturing() == Monitor::CAPTURING_ONDEMAND) {
SystemTimePoint now = std::chrono::system_clock::now();
monitors[i]->SetHeartbeatTime(now);
int64 since_last_view = static_cast<int64>(std::chrono::duration_cast<Seconds>(now.time_since_epoch()).count()) - monitors[i]->getLastViewed();
if (since_last_view > 10 and monitors[i]->Ready()) {
time_t last_viewed = monitors[i]->getLastViewed();
int64 since_last_view = static_cast<int64>(std::chrono::duration_cast<Seconds>(now.time_since_epoch()).count()) - last_viewed;
Debug(1, "Last view %jd= %" PRId64 " seconds since last view", last_viewed, since_last_view);
if (((!last_viewed) or (since_last_view > 10)) and (monitors[i]->GetLastWriteIndex() != monitors[i]->GetImageBufferCount())) {
if (monitors[i]->getCamera()->isPrimed()) {
monitors[i]->Pause();
}
@ -303,10 +305,12 @@ int main(int argc, char *argv[]) {
result = 0;
continue;
} else if (!monitors[i]->getCamera()->isPrimed()) {
if (1 > (result = monitors[i]->Play()))
if (1 > (result = monitors[i]->Play())) {
Debug(1, "Failed to play");
break;
}
}
}
} // end if ONDEMAND
if (monitors[i]->PreCapture() < 0) {
Error("Failed to pre-capture monitor %d %s (%zu/%zu)",