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

Break early after setting zm_terminate so that zms quits faster. Use a basic assignment instead of memcpy for last_frame_timestamp

pull/3087/head
Isaac Connor 2020-11-19 16:39:53 -05:00
parent 03f033cf36
commit 4f178e47bc
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/zm_monitorstream.cpp
View File

@ -691,6 +691,7 @@ void MonitorStream::runStream() {
if ( !sendFrame(snap->image, snap->timestamp) ) {
Debug(2, "sendFrame failed, quiting.");
zm_terminate = true;
break;
}
if ( frame_count == 0 ) {
// Chrome will not display the first frame until it receives another.
@ -698,14 +699,18 @@ void MonitorStream::runStream() {
if ( !sendFrame(snap->image, snap->timestamp) ) {
Debug(2, "sendFrame failed, quiting.");
zm_terminate = true;
break;
}
}
// Perhaps we should use NOW instead.
last_frame_timestamp = *snap->timestamp;
/*
memcpy(
&last_frame_timestamp,
snap->timestamp,
sizeof(last_frame_timestamp)
);
*/
// frame_sent = true;
temp_read_index = temp_write_index;