ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,883 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

19883 Commits

Author SHA1 Message Date
Jonathan Bennett 2beffeb1b4 Add Janus to Cycle view. Remove debug Alert() messages 2022-01-12 22:47:35 -06:00
Isaac Connor f764cfbc32 Fix deadlock on deleting event. Cannot race for the lock, joining will do the job 2022-01-12 23:11:19 -05:00
Isaac Connor 3d04228485 rework ::Analyse. The state engine will only go into alarm on actual motion, not on a skipped frame. TRIGGERS and ONVIF events will immediately create events. 2022-01-12 23:10:17 -05:00
Isaac Connor e4693c251c add backticks around field names because some like Function are reserved 2022-01-12 23:08:29 -05:00
Isaac Connor 8d06175024 Rework to use ZoneMinder::Monitor class. Simplify loadMonitors and get rid of loadMonitor. Add in ServerId change handling. 2022-01-12 23:07:48 -05:00
Isaac Connor a9f7b257ea Rough in a queue and a thread into the event to process packets. We do this so that the event creator can get back to analysis as fast as possible so as to avoid the packetqueue filling up. 2022-01-12 17:16:49 -05:00
Jonathan Bennett aeefc512ab
Merge branch 'master' into janus 2022-01-12 13:04:13 -06:00
Isaac Connor c9db5f44a4 cherry pick Add check to prevent tight busy loop if ONVIF setup fails 2022-01-12 12:05:33 -05:00
Isaac Connor 134d80a91d Replace Requires with BindsTo and add comment explaining how to override 2022-01-12 11:32:08 -05:00
Jonathan Bennett 84a73bb007 Add check to prevent tight busy loop if ONVIF setup fails 2022-01-12 09:37:48 -06:00
Jonathan Bennett 7a5a05fe94 Clean up warnings 2022-01-12 01:29:32 -06:00
Jonathan Bennett cb46b94ea1 Add error handling to libcurl calls to Janus 2022-01-12 00:19:54 -06:00
Jonathan Bennett 50c824f3bb Janus cleanup, adds support to the "watch" view 2022-01-11 21:21:58 -06:00
Isaac Connor c27b0aff97 Move analysis image assignment up to where motion detection is done do remove duplication and simplify logic. Free analysis images as well as captured images after analysis. remove extra copy of image to analysis_image. Replae a packetqueue.unlock with just deleting the locked packet. No one waits for analysis. Re-introduce sleeping in the analysis thread on error to prevent spinning 2022-01-11 22:11:28 -05:00
Isaac Connor ff91ac62fb add comment documenting why we sleep 2022-01-11 17:02:05 -05:00
Isaac Connor cd6c44db47 Revert "Remove sleeping from Analysis thread. It is uneccessary and results in us starting off way behind the capture thread. It also limits us to 30fps." 
This reverts commit 6c4156a483.
 2022-01-11 17:01:04 -05:00
Jonathan Bennett 2729e1de22
Merge branch 'ZoneMinder:master' into janus 2022-01-11 10:37:29 -06:00
Isaac Connor aaaf87abdb Don't try again if the error was ENOSPACE. it crashes and there is just no point. 2022-01-11 09:08:01 -05:00
Isaac Connor 90cbf5a018 Fix == instead of = 2022-01-11 09:06:43 -05:00
Jonathan Bennett 3a9c16aeea First working Janus build 2022-01-10 23:22:37 -06:00
Isaac Connor b88e699d7e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-01-10 19:56:04 -05:00
Isaac Connor 81fc392bc2 If error is ENOSPACE just give up. ffmpeg crashes if we try again. 2022-01-10 19:56:00 -05:00
Isaac Connor cb30f7639f revert broken commit. Isaac doesn't know what he's doing. 2022-01-10 18:47:26 -05:00
Isaac Connor a0c34f0d96 Fix. cppcheck was wrong about divider being able to go into deeper scope. 2022-01-10 18:33:01 -05:00
Isaac Connor 3f7b9dfff7 fix cppcheck error about lo_x. Inner scope overwriting it. 2022-01-10 17:36:50 -05:00
Isaac Connor 376d7fd7e5 log error if avcodec_parameters_to_context fails. Mostly to quiet cppcheck. Remove duplicated assignment to sample_fmt. 2022-01-10 17:36:50 -05:00
Isaac Connor 78a10b6095 cppcheck fixes 2022-01-10 17:36:49 -05:00
Isaac Connor 9f86fd3b16 add default_width and height to constructor 2022-01-10 17:36:49 -05:00
Isaac Connor 4697e36f11 add explicit 2022-01-10 17:36:49 -05:00
Isaac Connor 037771539d spacing, return a success value from setupCodec instead of using Fatal 2022-01-10 17:36:49 -05:00
Isaac Connor b406bf8fd1 remove last_send_image_width/height. Not really useful or relevant 2022-01-10 17:36:49 -05:00
Isaac Connor ed7bc7c4b4 whitespace 2022-01-10 15:25:15 -05:00
Isaac Connor ec95c8da57 Rename the monitor type define from CURL to LIBCURL to fix namespace conflict 2022-01-10 15:25:15 -05:00
Isaac Connor 3f7e4c67a0 Provide better logging when there is no data passwed to setAlarmCues 2022-01-10 15:25:15 -05:00
Isaac Connor 947132284d When transitioning from ALERT to IDLE, close the event if CLOSE_MODE is IDLE as well as ALARM. 2022-01-10 14:44:52 -05:00
Isaac Connor 701045393c fix typo 2022-01-10 09:07:59 -05:00
Isaac Connor e9db12ca94 Fix importance got cutnpasted to where it shouldn't be 2022-01-09 14:46:48 -05:00
Isaac Connor 21762585d9 rework getting second packet for de-interlace. Pass notesetmap by reference 2022-01-09 14:43:23 -05:00
Isaac Connor 1f6874dd53 add explicit 2022-01-09 14:43:23 -05:00
Isaac Connor f0c6413dc8 solve ccpcheck complaints 2022-01-09 14:43:23 -05:00
Isaac Connor c832fabafd solve ccpcheck complaints 2022-01-09 14:43:23 -05:00
Isaac Connor af8964c043
Merge pull request #3406 from jp-bennett/master 
Continued work on ONVIF
 2022-01-08 15:19:51 -05:00
Jonathan Bennett 52b377ca86 Adds the 'closes_event" ONVIF option, to handle motionDetection message quirks. 2022-01-08 14:05:57 -06:00
Jonathan Bennett a3c298ca93 Add nullptr checks to prevent a crash when in NODECT mode 2022-01-08 13:17:04 -06:00
Isaac Connor a153798b47 fix init when no GSOAP 2022-01-08 12:37:23 -05:00
Isaac Connor f01ecf2a16 Add libgsoap to dependencies 2022-01-08 12:37:05 -05:00
Isaac Connor dc975daa7a init soap to null in constructor. Stop analysis thread before destroying soap. 2022-01-08 12:21:29 -05:00
Isaac Connor c8bc0661b1 Have to clear src before resetting or some browsers won't load the new image 2022-01-08 12:14:28 -05:00
Isaac Connor 36a493ad5e bump to 1.37.7 2022-01-07 16:35:52 -05:00
Isaac Connor a2a04edcf7 Only init gsoap if we are capturing 2022-01-07 16:31:45 -05:00