Commit Graph

18730 Commits

Author SHA1 Message Date
Isaac Connor 0da4127114 cleanup ready_count update unneeded. Fix crash on reload due to being disconnected. 2021-04-29 07:07:12 -04:00
Isaac Connor 3d11366c0f restart stream when RTSP stream name changes 2021-04-29 06:38:42 -04:00
Isaac Connor a8bd1662e3 Add objdetect.gif support in filter email replacements 2021-04-28 19:12:37 -04:00
Isaac Connor 5622429cc2 update RtspServer 2021-04-28 19:00:16 -04:00
Isaac Connor b84efac0e5 left align Server head 2021-04-28 19:00:15 -04:00
Peter Keresztes Schmidt 4d18c515dc dep/span-lite: Remove erroneously added zm-dependency-interface
This is a header-only library so there is no target to compile for which warnings could be disabled.
Moreover a target dependency with INTERFACE visibility propagates to the dependants. This disabled warnings further down the chain.
2021-04-29 00:08:40 +02:00
Isaac Connor 1abadfafa1 Increase debug log level of allocating image 2021-04-28 16:13:57 -04:00
Isaac Connor e53628e0bd Remove old deinterlace code, make new code in ::decode. For 4 field, use the next image in the queue isntead of doing another capture 2021-04-28 16:13:41 -04:00
Isaac Connor ba652af347 Define deinterlace values in an enum 2021-04-28 16:13:10 -04:00
Isaac Connor 2302d814f2 Fix version test. split takes a regexp, so '.' matches everything. So change it to /\./. 2021-04-28 13:25:01 -04:00
Isaac Connor a9ca6f8c13 Check for packets in the queue before we start traversing it to prevent crash 2021-04-28 12:12:24 -04:00
Isaac Connor f754b82f3b When we do not have permission to edit monitors, return empty string instead of nothing so that we don't generate an error 2021-04-28 12:03:44 -04:00
Isaac Connor 33ed35c1f6 Use new zmupdate -s param touse system maintenance use to perform updates 2021-04-28 10:05:21 -04:00
Isaac Connor c50c30c6b5 Add super command line param to use mysql --defaults-file instead of zmuser/zmpass. This will only work for debian based systems. 2021-04-28 10:03:26 -04:00
Isaac Connor f61618b244 rework rtsp_server to look for new and free up old monitors 2021-04-27 16:35:13 -04:00
Isaac Connor 953882a6da Dirty hack to fix up/down arrows on pagination number input 2021-04-27 16:31:25 -04:00
Isaac Connor 0213c67236 add MinSectionLength 2021-04-27 15:25:09 -04:00
Isaac Connor 51d5b94650
Merge pull request #3224 from Carbenium/annotate-crash
Image: Fix crash in Annotate in GRAY8 and RGB24 mode
2021-04-27 15:15:58 -04:00
Peter Keresztes Schmidt 36205258c0 Image: Fix crash in Annotate in GRAY8 and RGB24 mode
Actually advance the image buffer pointer by one image line when looping through the codepoint lines.
2021-04-27 21:11:50 +02:00
Isaac Connor 2e35d94c94 Add missing source_ 2021-04-27 10:34:22 -04:00
Isaac Connor d9aac9bea9 it is ok to have empty monitors, should detect when new ones arrive 2021-04-27 10:28:46 -04:00
Isaac Connor 75973a2df1 Check for thread status before waiting. Fixes hang 2021-04-27 10:28:46 -04:00
Isaac Connor 9f49ac217e add Stopped function to test whether the analysis thread is stopped from outside the class 2021-04-27 10:28:46 -04:00
Isaac Connor df5b14dbd4
Merge pull request #3221 from Carbenium/zone-stats
Some optimizations/cleanups concerning Zones and ZoneStats
2021-04-27 09:26:07 -04:00
Isaac Connor 7901950c48 spacing 2021-04-26 09:40:08 -04:00
Isaac Connor 4385076e66 Fix encrypting password when saving User 2021-04-26 09:40:08 -04:00
Isaac Connor 02a1ecee6f Remove dbeug 2021-04-26 09:40:08 -04:00
Isaac Connor 7bbcb7e36a
Merge pull request #3223 from Carbenium/font
Modernize the ZmFont API and add tests
2021-04-25 19:57:32 -04:00
Isaac Connor 1204a23789
Merge pull request #3222 from Carbenium/monitor-destr-crash
Monitor: Fix a crash when destroying a monitor (shutdown)
2021-04-25 18:58:52 -04:00
Peter Keresztes Schmidt 3020acf994 ZmFont: Store character padding in font file
The size/variant specific character padding should be stored with the font data.
Modify the FontBitmapHeader accordingly and introduce a version field in the FontFileHeader
so we are able to check we have a font file with the right structure associated with that version.

The version field is set to 1 in this changeset.
2021-04-25 23:13:21 +02:00
Peter Keresztes Schmidt a918e8aeba Image: Modernize Annotate method 2021-04-25 23:13:21 +02:00
Peter Keresztes Schmidt 07e49e47af utils: Add a clamping function mimicking std::clamp
This can be replaced with std::clamp in C++17.
2021-04-25 23:13:21 +02:00
Peter Keresztes Schmidt 4d14347c42 tests: Add tests for ZmFont 2021-04-25 23:13:21 +02:00
Peter Keresztes Schmidt 0c939f45dd ZmFont: Rework/modernize API 2021-04-25 23:13:21 +02:00
Peter Keresztes Schmidt 9f56f633f1 dep: Add span-lite as C++20 span implementation
Link to the project https://github.com/martinmoene/span-lite
2021-04-25 23:13:21 +02:00
Peter Keresztes Schmidt 6d06eac55e Monitor: Fix a crash when destroying a monitor (shutdown)
We have to make sure close_event_thread is joined before we destroy the thread object,
otherwise std::terminate will be called.
2021-04-25 23:09:32 +02:00
Peter Keresztes Schmidt 4180bc99ac Zone: Sprinkle some const-ness
Keep references in for-loops const if no modifications are preformed on the object.
2021-04-25 22:34:33 +02:00
Peter Keresztes Schmidt d4458d1216 Monitor: Store zones as vector instead of list
std::vector suits the usage pattern better with no random inserts/deletions
2021-04-25 22:29:18 +02:00
Peter Keresztes Schmidt bb35d0a8bb Frame: Auto-format 2021-04-25 22:29:18 +02:00
Peter Keresztes Schmidt eb51408ef9 ZMPacket+Frame: Use vector to store ZoneStats
We don't any of the usage patterns that would warrant a std::list (random insert/deletion). Switch to vector which has much lower overhead for this kind of usage.
2021-04-25 22:29:18 +02:00
Peter Keresztes Schmidt ad32a94931 ZoneStats: Rename members according to Google style guide 2021-04-25 17:18:07 +02:00
Peter Keresztes Schmidt 9e4674b53a ZoneStats: Let the compiler define the copy constr. and assignment op.
There is no need for the user-defined versions since no manual resource management is done in the class.
Also a user-defined copy constructor or assignment operator prevents the implicit definition of a move constructor.
2021-04-25 17:18:07 +02:00
Isaac Connor df754f0085 Can't do suspend in sendCmd 2021-04-24 19:22:17 -04:00
Isaac Connor 8d4c2afda8 Can't do suspend in sendCmd 2021-04-24 12:00:38 -04:00
Peter Keresztes Schmidt 1dbfa0790a web: fix eslint errors 2021-04-24 01:42:13 +02:00
Isaac Connor d1687df6af Bump version to 1.35.27 for ModetDuringPTZ changes 2021-04-23 14:52:29 -04:00
Isaac Connor 4843cb8593 Add ModectDuringPTZ and suspend and resume functions 2021-04-23 14:52:29 -04:00
Isaac Connor e256d9a5a8 Use ZoneMinder::Monitor->find_one instead of zmDbGetMonitor so that we get an object with useful methods 2021-04-23 14:52:29 -04:00
Isaac Connor 36ac473ad2 Add suspend/resume of MotionDetection of ModectDuringPTZ is off. 2021-04-23 14:52:29 -04:00
Isaac Connor 95a715a96a When resume is given, clear the ref image, so that analysis can re-assign it. Don't do ref image in decode, leave it for analysis only. Handle zm_terminate after waiting for decode. 2021-04-23 14:52:29 -04:00