Commit Graph

23422 Commits (17a218a5a39f9a7827c8f09d2e581995fc9a803b)

Author SHA1 Message Date
Isaac Connor f54f10df72 Add server stats fields 2024-02-20 13:14:23 -05:00
Isaac Connor 68e2b19440 Update to use Server module updates and store CpuUsage stats instead of just load 2024-02-20 13:13:27 -05:00
Isaac Connor 93ef297c24 Implement CpuUsage to get data either from /proc/stat or top output. 2024-02-20 13:12:50 -05:00
Aaron Kling e710127924 ffmpeg: Rework decode and encode flows
send_packet will fail with -EAGAIN if receive_frame hasn't consumed the
last packet. Similarly send_frame will fail if receive_packet has
pending frames.

This fixes problems with the raspberry pi hardware decoder. The change
likely affects many other codecs as well.
2024-02-19 17:17:24 -06:00
Isaac Connor ff41c1612f Use time instead of pts for legibility in warning about jumping back in time. Don't break capture until we have at least 5 of these errors. 2024-02-19 09:52:10 -05:00
Isaac Connor def378fe12 Fix relative path to dms.js 2024-02-17 11:59:09 -05:00
Isaac Connor d32b4809af Add duration mode to eventclosemode 2024-02-17 10:49:25 -05:00
Isaac Connor c947da47a9 Add duration mode to eventclosemode 2024-02-17 10:49:15 -05:00
Isaac Connor 0b7cbee812
Merge pull request #3831 from ovargasp/master
On Options -> System , show languages with names not codes/filenames
2024-02-16 21:23:55 -05:00
Server 16392fc1fb removed unnecessary definition in lang file. 2024-02-16 18:09:34 -06:00
Server 78676ac249 On Options -> System , show languages with names not codes/filenames
Possible implementation for issue #3694
2024-02-16 18:02:15 -06:00
Isaac Connor 01ebcad29c Put back test for out of order packets. These buffers can take up a lot of ram even though they may not be needed. 2024-02-16 11:29:15 -05:00
Isaac Connor 2fd7c089e3 Update loading the download modal. Include the monitor and events filters, include auth_relay 2024-02-15 16:27:30 -05:00
Isaac Connor 7e98cf36d6 Remove requirement for id or eids. We can specify by filter now. Fix populating exportIds making sure it is an array. 2024-02-15 16:21:39 -05:00
Isaac Connor 49fb9cde12 Fix typo 2024-02-15 13:32:38 -05:00
Isaac Connor f339ba5508 When listing option name, remove the ZM_ to be consistent with the options view 2024-02-15 12:54:39 -05:00
Isaac Connor 83b2e20b34 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-02-15 09:38:26 -05:00
Isaac Connor 4424bab051 Add a resize handler 2024-02-15 09:38:17 -05:00
Isaac Connor 602959adce Fix issue with packet have score != -1. We don't set snap->score until after doing motion detection because we give up if we are waiting for decoding. We now always do state transitions regardless of whether we did motion detection. 2024-02-15 09:33:23 -05:00
Isaac Connor 29d70ab79b Revert "Revert "Merge score and snap->score. The effect is to treat all alarms as alarmed frames regardless of source. Should fix linked monitors ending the event early""
This reverts commit efe5c02223.
2024-02-15 09:00:31 -05:00
Isaac Connor efe5c02223 Revert "Merge score and snap->score. The effect is to treat all alarms as alarmed frames regardless of source. Should fix linked monitors ending the event early"
This reverts commit 0e1cf9beda.
2024-02-15 08:13:45 -05:00
Isaac Connor 0e1cf9beda Merge score and snap->score. The effect is to treat all alarms as alarmed frames regardless of source. Should fix linked monitors ending the event early 2024-02-14 17:22:26 -05:00
Isaac Connor 50c61a733c Fix missing ` 2024-02-14 15:41:18 -05:00
Isaac Connor af9402cde8 Add db update for SOAP_wsa_compl. Bump version as a result 2024-02-13 17:38:11 -05:00
Isaac Connor 7517de2811 Add some more debugging. Include zm_terminate in while loop condition. return instead of continuing to process nals if _stop or _zmterminate 2024-02-13 16:34:01 -05:00
Isaac Connor 839f09dba1 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-02-13 13:54:10 -05:00
Isaac Connor 013f6daaf6 Put back Accept-Ranges as it breaks seeking 2024-02-13 13:54:04 -05:00
Isaac Connor 01c6df434c Move code to shutdown the process properly into exit_zms and use it when auth fails. The stops a segfault. 2024-02-13 13:14:39 -05:00
Isaac Connor 565badeaa5
Merge pull request #3828 from ovargasp/snapshot_1.37.50
SOAP WSA option for Chinese cameras
2024-02-13 10:02:38 -05:00
Server 0ff48f631e Implements an option to disable soap_wsa code that doesn't work
with some chinese cameras, more common to Latam zone
2024-02-12 19:22:01 -06:00
Isaac Connor 8ffbc1d6f0 INclude monitor Name in monitors array, because it useful to show monitors by name instead of id 2024-02-11 19:13:48 -05:00
Isaac Connor dc556c0f70 Handle user being undefined when not logged in 2024-02-11 19:12:37 -05:00
Isaac Connor b57b434c6a
Merge pull request #3823 from davvid/cmake
cmake: export compile_commands.json for use by development tools
2024-02-11 13:57:25 -05:00
Isaac Connor c598358490
Merge pull request #3827 from davvid/podman
distros: add a Containerfile for building zoneminder using podman
2024-02-11 13:52:36 -05:00
Isaac Connor 0fddf96e4e
Merge pull request #3826 from davvid/user-memleak
zm_user: avoid memory leak when user cannot be authenticated
2024-02-11 12:58:12 -05:00
ovargasp 5d5210b116 Changes to zm_monitor code to enable/disable soap_wsa support
for chinnese cameras that doesn't have it implemented
2024-02-11 07:42:58 -06:00
David Aguilar 1bfb7bea20 distros: add a Containerfile for building zoneminder using podman 2024-02-10 14:54:28 -08:00
David Aguilar a3e15b57d8 cmake: export compile_commands.json for use by development tools 2024-02-10 13:38:25 -08:00
David Aguilar 2e9379b3f5 zm_user: avoid memory leak when user cannot be authenticated 2024-02-09 22:53:19 -08:00
Isaac Connor 51020e92a4
Merge pull request #3822 from IgorA100/patch-1
Sorting an array of events when merging into a file
2024-02-09 10:35:05 -05:00
Isaac Connor 8bb368fe13 Fix children MonitorIds not being included due to the use of + instead of array_merge 2024-02-09 10:33:22 -05:00
IgorA100 a204a973f1
Code optimization 2024-02-09 18:09:51 +03:00
IgorA100 d0dc4bcbe1
Sorting an array of events when merging into a file
When merging events into a file, they must first be sorted by time and start date of the event.
2024-02-09 17:34:06 +03:00
Isaac Connor b87c86621a Set zm_terminate on io error 2024-02-08 14:42:08 -05:00
Isaac Connor 31af9d905c Still generate an auth if no password present. 2024-02-08 13:31:21 -05:00
Isaac Connor ec20772f98 Use const on bottomLoc 2024-02-08 12:34:33 -05:00
Isaac Connor f795fb3c19 fix unexpected this, although according to jquery docs it is totally valid 2024-02-08 12:33:32 -05:00
Isaac Connor 79ce5cf80f When monitor is Decoding==None send a more informative text image saying so. Instead of simply returning, set zm_terminate and go through the normal flow so that comms thread and db threads terminate as well. Might fixes zms hangs 2024-02-08 10:58:58 -05:00
Isaac Connor 00f27ca8af Add autocomplete=off to Montage Layout name 2024-02-08 10:27:39 -05:00
Isaac Connor 5acf359e14 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-02-07 16:50:25 -05:00