Commit Graph

17917 Commits

Author SHA1 Message Date
Peter Keresztes Schmidt eef0da8f19 Remove references to <csignal> from AnalysisThread
The removed block_set member was unused.
2021-02-04 18:02:08 +01:00
Peter Keresztes Schmidt 21fdb1f345 Build: Add libLive555 to optlibsnotfound if not found 2021-02-04 18:02:08 +01:00
Peter Keresztes Schmidt 22372b5117 Replace #pragama once with include guards to be consistent 2021-02-04 18:02:08 +01:00
Peter Keresztes Schmidt 8869bfd903 Gut out zm.h since it is used only to store the self variable 2021-02-04 18:02:08 +01:00
Peter Keresztes Schmidt 0dbc39ee25 Cleanup and reorganize includes
With this commit a unified structure for includes is introduced.
The general rules:
 * Only include what you need
 * Include wherever possible in the cpp and forward-declare in the header

 The includes are sorted in a local to global fashion. This means for the include order:
  0. If cpp file: The corresponding h file and an empty line
  1. Includes from the project sorted alphabetically
  2. System/library includes sorted alphabetically
  3. Conditional includes
2021-02-04 18:02:01 +01:00
Isaac Connor 046e352304 improvements to fps reporting. In analysis, we report based on image packets processed, but the fps value is calculated based on the count of images we did motion detection on. We no longer count audio packets in capture fps reporting. 2021-02-04 11:50:01 -05:00
Isaac Connor ad9fd05955 When allocating mVideoStream, set mVideoStreamId as well 2021-02-04 10:28:17 -05:00
Isaac Connor ac42aa2488 Setup mVideoStream and mVideoStreamId and set it in packet. 2021-02-04 10:27:56 -05:00
Peter Keresztes Schmidt 5a57efdfe2 Replace deprecated C header includes with the C++ ones. 2021-02-04 05:39:03 +01:00
Isaac Connor c61e6a8c56 If there is an open event in disconnect close it. The idea is that by the time we get to the destructor we should be all shut down 2021-02-03 17:04:40 -05:00
Isaac Connor 6ac5472606 Add disconnecting to zmc to free up resources. 2021-02-03 16:58:03 -05:00
Isaac Connor cb60b6c141 Fix bulk frame code and move it to event. Revert base score to 0. Fix cause of continuous events. Move GetState to .h 2021-02-03 16:57:44 -05:00
Isaac Connor 35470951ad Move the bulk frame logic from monitor to event. Fix up the logic of when to store a db frame. Fix altering max_score too early 2021-02-03 16:56:34 -05:00
Peter Keresztes Schmidt 4db0dea1f2 Build: Make building man pages optional (enabled by default)
Add a new CMake option (-DBUILD_MAN) which can be used
to deactivate the man page build steps.
This is especially useful in a development situation where "make all"
is needlessly slowed down by these build steps.
2021-02-03 21:22:28 +01:00
Isaac Connor d4e83620b2 Split actions and options columns into 50% 2021-02-03 12:57:17 -05:00
Isaac Connor a7365323dd Split actions and options in filters to fit more horizontally 2021-02-03 12:57:17 -05:00
Isaac Connor e05fdf423b
Merge pull request #3125 from gmanic/patch-1
corrected $this to $self
2021-02-03 10:21:33 -05:00
Isaac Connor e085acedc8 ALlow micro version mismatches to not be fatal. Minor and Major are still fatal. 2021-02-03 09:50:37 -05:00
Isaac Connor 8a99665311 better variable names and code documentation 2021-02-03 09:50:13 -05:00
Isaac Connor be1db1ff20 Score should be a signed int 2021-02-03 09:08:06 -05:00
Isaac Connor 3fd98ee9c1 Bump version to add RTSPServer column to Monitors 2021-02-03 08:33:10 -05:00
gmanic 037f197f54
corrected $this to $self 2021-02-03 12:53:33 +01:00
Isaac Connor c35869fd30 Use jquery offset() to get image position 2021-02-02 23:19:53 -05:00
Isaac Connor f868d92269 Fix colour shift in Crop function due to not multiplying x position by colours 2021-02-02 23:19:53 -05:00
Isaac Connor 49e9bf86fa Code style 2021-02-02 23:19:53 -05:00
Isaac Connor 09d8dbb460 spacing 2021-02-02 23:19:53 -05:00
Isaac Connor 0958768ce5 Fix no bulk frames by setting score to -1 which means BULK. It will get changed to 0 or more by later code. Fixes #3121 2021-02-02 23:19:53 -05:00
Isaac Connor 7e469a28fa remove redundant code, code style and remove some unnecessary multiplies 2021-02-02 23:19:53 -05:00
Isaac Connor 38368a8b9d remove deprecated video_buffer_duration stuff. Fix loading monitor column order 2021-02-02 23:19:53 -05:00
Isaac Connor c8af90fd24 Add RTSP Server checkbox 2021-02-02 23:19:52 -05:00
Isaac Connor e09c80e385 Have to close camera AFTER threads have stopped 2021-02-02 23:19:52 -05:00
Isaac Connor 61c3c0d565 Should increment_it after releasing the packet to prevent deadlock 2021-02-02 23:19:52 -05:00
Isaac Connor 8de260472d improve the logic of clearing packets from queue. make get_event_start_it return a pointer to an it tracked by the packetqueue. 2021-02-02 23:19:52 -05:00
Isaac Connor cb0008fb8c Add rtsp_server and accessor 2021-02-02 23:19:52 -05:00
Isaac Connor afa5e27d56 load RTSPServer column as well. start_it needs to be tracked by packetqueue. We no longer close the camera in Monitor::Close because we need to clear the packetqueue, then wait for threads to finish, THEN close camera. So that logic needs to move to zmc 2021-02-02 23:19:52 -05:00
Isaac Connor 5c6ba2f27f add RTSPServer column to Monitors 2021-02-02 23:19:52 -05:00
Isaac Connor 2fa0fbe448 Upgrade cakephp to 2.10.24 2021-02-02 23:19:52 -05:00
Isaac Connor 2996fe3da7 fix hiding cloneBtn 2021-02-02 23:19:52 -05:00
Peter Keresztes Schmidt 5bc21a113c CI/GitHub: Remove checkout step which throws a deprecation warning.
The warning:
 1 issue was detected with this workflow: git checkout HEAD^2 is no longer necessary. Please remove this step as Code Scanning recommends analyzing the merge commit for best results.
2021-02-03 01:01:35 +01:00
Isaac Connor d762ebde61
Merge pull request #3122 from Carbenium/int-typedefs
Typedef C++11 int types to make them easier to use
2021-02-02 17:11:33 -05:00
Andrew Bauer fdbab5adc3 rpmspecfile README - update zmuser creation on newer sql's 2021-02-02 15:18:54 -06:00
Peter Keresztes Schmidt 0c5c720e4b Remove includes of <stdint.h>
Instead of including the deprecated header <stdint.h>, zm_define.h should be used.
2021-02-02 21:37:26 +01:00
Peter Keresztes Schmidt e09fa1bebf Remove includes of <cinttypes>
Instead of including <cinttypes> directly, zm_define.h should be used
to get the typedef'ed types as well.
2021-02-02 21:37:26 +01:00
Peter Keresztes Schmidt 0f5df0c739 zm: Typedef C++11 int types to make them easier to use
In order to clearly state the intended length of an integer variable
all usages of other integer types (short int, int, long int, ...)
should be converted.
2021-02-02 21:37:26 +01:00
Isaac Connor b35e27d0b6 Use decodeURIComponent instead of decodeURI 2021-02-02 09:12:34 -05:00
Isaac Connor 49d3e5ddbf decodeURI row.Message 2021-02-02 09:09:53 -05:00
Isaac Connor b6c258c41f Revert "add_stylesheet is deprecated. Use add_css_file instead"
Since we still use older sphinx we need to live with the deprecation warnings until we can figure out a way to support old and new.

This reverts commit 84d9d363c9.
2021-02-02 08:24:32 -05:00
Isaac Connor 105eff7a21 Remove references to zma 2021-02-01 17:29:16 -05:00
Isaac Connor 49209d9e72 populate mid if specified to enable reusing mids. Fix auto-populating resolution dropdown 2021-02-01 16:45:13 -05:00
Isaac Connor 0dc6b60985 Use new insert function to allow re-use of monitor Ids 2021-02-01 16:44:41 -05:00