ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,215 Commits
32 Branches
93 Tags
162 MiB
Commit Graph

20215 Commits (723c10ca19c65c9426a10069e24830b5fecaeadb)

Author SHA1 Message Date
Isaac Connor 723c10ca19 Cleanup options, add DecodingOptions 2022-03-28 17:45:01 -04:00
Isaac Connor 39d45e527c Switch from DecodingEnabled to DecodingOption. Implement the logic in ::Decode. 2022-03-28 17:44:44 -04:00
Isaac Connor 32109697d2 Add update for add Decoding to Monitors 2022-03-28 16:22:18 -04:00
Isaac Connor a6193bba0e Fill in Protocol of HikVision control 2022-03-28 14:40:21 -04:00
Isaac Connor 55ae6ba4a5 rough in Url, UrlToZMS PathToZMS PathToIndex, UrlToIndex UrlToApi PathToApi in SERver object 2022-03-28 14:30:08 -04:00
Isaac Connor 0e4c175aba clean up debug 2022-03-28 13:49:46 -04:00
Isaac Connor d6e504aa34 trim all monitor inputs before looking for errors. No inputs should have whitespace at beginning or end 2022-03-28 13:47:45 -04:00
Isaac Connor bdffa10cc6 limit logging of full packetqueue 2022-03-27 13:14:40 -04:00
Isaac Connor bf4d2a82d6 handle when maxfps is not specified 2022-03-27 12:17:00 -04:00
Isaac Connor 75833abbe7 Move convertContext code to it's own function for readability. Use it to clean up code in Decode 2022-03-26 20:32:05 -04:00
Isaac Connor cc1368ba2c Move code for AVPixFormat to .cpp instead .h. Add const's so we can use it on cost Image * vars 2022-03-26 20:31:33 -04:00
Isaac Connor f17ca48cab Default end_time to start_time on event creation so that we don't get a negative duration 2022-03-26 12:47:46 -04:00
Isaac Connor 9f404f7b97 Add test for event before calling event->Duration. 2022-03-26 12:47:26 -04:00
Isaac Connor 1c9c3d34f5 Free up raw images early when not recording also. Also free up decoded frame ram 2022-03-25 13:50:12 -04:00
Isaac Connor 8458eb741a Don't store keyframes in packetqueue if we are not recording at all. 2022-03-25 12:26:05 -04:00
Isaac Connor 2b8fee80de escape html in Storage names 2022-03-21 16:06:52 -04:00
Isaac Connor 99e78debf5 Use shared_data->analysing instead of analysing in tests since we could be disabled by zmu. 2022-03-21 15:58:01 -04:00
Isaac Connor 0850e0db70 Remove Enabled test, replace with Capturing and Recording tests 2022-03-21 15:56:16 -04:00
Isaac Connor 531793276f Fix auth'd user information being saved to session before switching session id's leaving bogus authenticated user in previous session. 2022-03-21 15:31:44 -04:00
Isaac Connor 08598ace6b remove space 2022-03-20 19:13:46 -04:00
Isaac Connor 965e256bbc remove space 2022-03-20 19:13:46 -04:00
Isaac Connor ed41e63980 Can't treat anlysing as a boolean because ANALYSING_NONE==1. Should fix zm oing motion detection when set to NONE 2022-03-20 19:13:46 -04:00
Isaac Connor 23aa41091f Add Trigger/etc to onMotion recording option 2022-03-20 19:13:46 -04:00
Isaac Connor b67185fe9c Fix alignment on Capture Method 2022-03-20 19:13:46 -04:00
Isaac Connor 13f403c56e fix eslint 2022-03-13 08:47:11 -04:00
Isaac Connor 9aeeb58014 Fix missed Function => Capturing == None 2022-03-13 08:37:33 -04:00
Isaac Connor 6aeb163cba Fix lock around terminate 2022-03-13 08:37:33 -04:00
Isaac Connor c6a1a4ff0e Fix potential XSS from Username 2022-03-13 08:34:44 -04:00
Isaac Connor 48d3526459 Fix potential XSS from Username 2022-03-13 08:19:12 -04:00
Isaac Connor 550693af10 Add a pattern to prevent invalid username characters 2022-03-10 14:10:31 -05:00
Isaac Connor 07aa171c04 Output valid html only for Username to prevent XSS 2022-03-10 14:10:04 -05:00
Isaac Connor f49601a173 Add filtering to Username to prevent XSS 2022-03-10 14:09:41 -05:00
Isaac Connor c395d46cc8 Split options into Capturing, Analysing, Recording tabs 2022-03-10 13:54:38 -05:00
Isaac Connor b103072b7e Cleanup code a bit moving variable declarations around to where they are used and removing duplicated curl free. 2022-03-10 12:24:00 -05:00
Isaac Connor 5dc4e5ddb4 Fix compile warning. Rename variables to be more descriptive and remove unused ones 2022-03-10 12:09:02 -05:00
Isaac Connor 4b03b0a1a6
Merge pull request #3454 from gonzalezcalleja/fix_zmpkg_status 
Fix zmpkg status
 2022-03-09 15:58:02 -05:00
Javier Gonzalez 6a2d0fa81a Fix 2022-03-09 21:14:25 +01:00
Javier Gonzalez 224d275950 Fix 2022-03-09 21:13:34 +01:00
Javier Gonzalez 3d093ed8a6 Fix monitor not change status when zoneminder state change 2022-03-09 21:07:39 +01:00
Isaac Connor e84b82df18
Merge pull request #3453 from gonzalezcalleja/add_recording_status 
Show recording status to console
 2022-03-09 14:44:38 -05:00
Isaac Connor d76f2e4b0b
Merge pull request #3452 from gonzalezcalleja/fix_zmpkg_capturing 
Fix zmpkg recording status
 2022-03-09 14:42:18 -05:00
Javier Gonzalez cc3b5421f5 Adding recording status to console 2022-03-09 19:59:21 +01:00
Javier Gonzalez 4a1dbc884d Fix zmpkg recording status 2022-03-09 19:40:04 +01:00
Isaac Connor e943f0a411
Merge pull request #3450 from gonzalezcalleja/fix_zmpkg 
Fix when using a custom state with zmpkg.pl
 2022-03-08 11:21:00 -05:00
Javier Gonzalez 858ab62fc4 Fix when using a custom state 2022-03-08 17:10:29 +01:00
Isaac Connor 05b5ca9b15 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-03-08 09:06:37 -05:00
Isaac Connor 0785e3571c code style, remove duplicated code. 2022-03-08 09:06:31 -05:00
Isaac Connor a748b0ed0a When connecting to a monitor, if it fails, disconnect. This should fix a bug in zmtrigger and others where it would never reconnect. The idea is that we asked for a successful connection, if it failed, we shouldn't be in a failed connected state, we should be disconnected. 2022-03-08 09:06:06 -05:00
Isaac Connor 8fe0cb5e33 tidy up the mem_info hash and turn into a hash instead of a pointer to a hash. Check for validity flah before checking sizes. Improve debug logging. 2022-03-08 09:04:41 -05:00
Isaac Connor b13fd68376
Merge pull request #3449 from jp-bennett/master 
Add rtsp_quirk to Janus mountpoints.
 2022-03-05 12:48:47 -05:00