ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle no frame/duration information more gracefully

This commit is contained in:
Isaac Connor 2021-01-26 12:20:55 -05:00
parent e10d15fa91
commit 0ecbe29ac0
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/zm_eventstream.cpp
View File

@ -29,12 +29,13 @@
#include "zm_monitor.h" #include "zm_monitor.h"
#include "zm_sendfile.h" #include "zm_sendfile.h"
static std::string StreamMode_Strings[4] = {
"None", const std::string EventStream::StreamMode_Strings[4] = {
"Single", "None",
"All", "Single",
"Gapless" "All",
}; "Gapless"
};
bool EventStream::loadInitialEventData(int monitor_id, time_t event_time) { bool EventStream::loadInitialEventData(int monitor_id, time_t event_time) {
static char sql[ZM_SQL_SML_BUFSIZ]; static char sql[ZM_SQL_SML_BUFSIZ];
@ -222,7 +223,7 @@ bool EventStream::loadEventData(uint64_t event_id) {
event_data->event_id); event_data->event_id);
} }
updateFrameRate((double)event_data->frame_count/event_data->duration); updateFrameRate((event_data->frame_count and event_data->duration) ? (double)event_data->frame_count/event_data->duration : 1);
snprintf(sql, sizeof(sql), "SELECT `FrameId`, unix_timestamp(`TimeStamp`), `Delta` " snprintf(sql, sizeof(sql), "SELECT `FrameId`, unix_timestamp(`TimeStamp`), `Delta` "
"FROM `Frames` WHERE `EventId` = %" PRIu64 " ORDER BY `FrameId` ASC", event_id); "FROM `Frames` WHERE `EventId` = %" PRIu64 " ORDER BY `FrameId` ASC", event_id);
@ -349,8 +350,7 @@ void EventStream::processCommand(const CmdMsg *msg) {
curr_frame_id = 1; curr_frame_id = 1;
} else { } else {
Debug(1, "mode is %s, current frame is %ld, frame count is %ld, last frame id is %ld", Debug(1, "mode is %s, current frame is %ld, frame count is %ld, last frame id is %ld",
(mode == MODE_SINGLE ? "single" : "not single"), StreamMode_Strings[(int)mode], curr_frame_id, event_data->frame_count );
curr_frame_id, event_data->frame_count );
} }
replay_rate = ZM_RATE_BASE; replay_rate = ZM_RATE_BASE;
@ -597,7 +597,7 @@ void EventStream::processCommand(const CmdMsg *msg) {
if ( (MsgCommand)msg->msg_data[0] == CMD_QUIT ) if ( (MsgCommand)msg->msg_data[0] == CMD_QUIT )
exit(0); exit(0);
updateFrameRate((double)event_data->frame_count/event_data->duration); updateFrameRate((event_data->frame_count and event_data->duration) ? (double)event_data->frame_count/event_data->duration : 1);
} // void EventStream::processCommand(const CmdMsg *msg) } // void EventStream::processCommand(const CmdMsg *msg)
bool EventStream::checkEventLoaded() { bool EventStream::checkEventLoaded() {
@ -672,7 +672,7 @@ bool EventStream::checkEventLoaded() {
mysql_free_result(result); mysql_free_result(result);
forceEventChange = false; forceEventChange = false;
} else { } else {
Debug(2, "Pausing because mode is %d", mode); Debug(2, "Pausing because mode is %s", StreamMode_Strings[mode].c_str());
if ( curr_frame_id <= 0 ) if ( curr_frame_id <= 0 )
curr_frame_id = 1; curr_frame_id = 1;
else else
@ -845,7 +845,7 @@ void EventStream::runStream() {
exit(0); exit(0);
} }
updateFrameRate((double)event_data->frame_count/event_data->duration); updateFrameRate((event_data->frame_count and event_data->duration) ? (double)event_data->frame_count/event_data->duration : 1);
gettimeofday(&start, nullptr); gettimeofday(&start, nullptr);
uint64_t start_usec = start.tv_sec * 1000000 + start.tv_usec; uint64_t start_usec = start.tv_sec * 1000000 + start.tv_usec;
uint64_t last_frame_offset = 0; uint64_t last_frame_offset = 0;
@ -1006,10 +1006,10 @@ void EventStream::runStream() {
delta_us = ((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*(replay_rate?abs(replay_rate*2):2))); delta_us = ((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*(replay_rate?abs(replay_rate*2):2)));
Debug(2, "Sleeping %d because 1000000 * ZM_RATE_BASE(%d) / ( base_fps (%f), replay_rate(%d)", Debug(2, "Sleeping %d because 1000000 * ZM_RATE_BASE(%d) / ( base_fps (%f), replay_rate(%d)",
(unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2))), delta_us,
ZM_RATE_BASE, ZM_RATE_BASE,
(base_fps?base_fps:1), (base_fps ? base_fps : 1),
(replay_rate?abs(replay_rate*2):0) (replay_rate ? abs(replay_rate*2) : 0)
); );
if ( delta_us > 0 ) { if ( delta_us > 0 ) {
if ( delta_us > MAX_SLEEP_USEC ) { if ( delta_us > MAX_SLEEP_USEC ) {