From 59e8bca3bcd031e130fcc4174e2af295b300dbd5 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 19 Nov 2021 11:59:19 -0500 Subject: [PATCH] timestamp image before scaling. Fixes lack of scaling when TIMESTAMP_ON_CAPTURE is off --- src/zm_monitorstream.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp index 126ed708e..5d7309435 100644 --- a/src/zm_monitorstream.cpp +++ b/src/zm_monitorstream.cpp @@ -377,9 +377,10 @@ bool MonitorStream::sendFrame(const char *filepath, const timeval ×tamp) { return false; } // end bool MonitorStream::sendFrame(const char *filepath, struct timeval *timestamp) -bool MonitorStream::sendFrame(Image *image, const timeval ×tamp) { - if (!config.timestamp_on_capture) +bool MonitorStream::sendFrame(Image *image, SystemTimePoint timestamp) { + if (!config.timestamp_on_capture) { monitor->TimestampImage(image, timestamp); + } Image *send_image = prepareImage(image); fputs("--" BOUNDARY "\r\n", stdout); @@ -863,6 +864,10 @@ void MonitorStream::SingleImage(int scale) { int index = monitor->shared_data->last_write_index % monitor->image_buffer_count; Debug(1, "write index: %d %d", monitor->shared_data->last_write_index, index); Image *snap_image = monitor->image_buffer[index]; + if (!config.timestamp_on_capture) { + monitor->TimestampImage(snap_image, + SystemTimePoint(zm::chrono::duration_cast(monitor->shared_timestamps[index]))); + } if (!config.timestamp_on_capture) { monitor->TimestampImage(snap_image, monitor->shared_timestamps[index]);