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

18390 Commits

Author SHA1 Message Date
Isaac Connor f52ead7cda introduce packetqueue::unlock to unlock packets and notify anyone waiting. Also check for iterators pointing to packets when not keeping keyframes. Loop with waiting when we can't lock a packet 2021-04-01 11:52:25 -04:00
Isaac Connor 1c9bc5c27f code doc and spacing 2021-04-01 11:51:18 -04:00
Isaac Connor 137f7aad6b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-04-01 09:28:02 -04:00
Isaac Connor 1fd9361e4e use zmDbDo to replace many lines of code 2021-04-01 09:27:49 -04:00
Isaac Connor 757ec2dbc1 Improve zmDbDo to return rows affected instead of boolean 2021-04-01 09:27:20 -04:00
Isaac Connor 80e5076d2a cache bust jquery and bootstrap 2021-03-31 18:27:43 -04:00
Isaac Connor 22d713cd9c fix packetqueue corruption. Can't wait after grabbing the packet. 2021-03-31 16:49:19 -04:00
Isaac Connor ddb62a27c6 Fix queue full message. Remove test for empty queue. We don't care if the queue is empty. Improve debug logging. 2021-03-31 16:49:19 -04:00
Isaac Connor fd23b3e284 Adjust debug levels 2021-03-31 16:49:19 -04:00
Isaac Connor 9f5bc8b2b9
Merge pull request #3174 from akeyx/3173-bugfix-fix-onvif-control 
3173 bugfix fix onvif control
 2021-03-30 18:38:00 -04:00
Isaac Connor 198d205188 bump version for 1.35.23 2021-03-30 18:33:46 -04:00
Isaac Connor dedf42371b copy onvif.pm which isn't actually onvif to FoscamCGI.pm We will later replace onvif.pm with an Actual onvif implementation. 2021-03-30 18:32:42 -04:00
Isaac Connor 6c4e423a8b Spacing 2021-03-30 18:20:31 -04:00
Isaac Connor 3d01008510 use json_encode($User) instead of specific elements. For some reason $user['Id'] isn't defined for me atm. 2021-03-30 18:20:23 -04:00
Isaac Connor a1364a2b2b delete packet_lock if failed trylock 2021-03-30 16:14:42 -04:00
Isaac Connor 649f7906de Need to track locked status so that if we fail a trylock we remember it and don't try to unlock later 2021-03-30 16:14:42 -04:00
Isaac Connor d54ba9b324 Change url used for authentication to magicBox.cgi?action=getDeviceType 2021-03-30 16:14:42 -04:00
Isaac Connor e92dcf1457 Add special case for older ffmpeg that has different AV_CODEC define numbers 2021-03-30 14:28:40 -04:00
Isaac Connor cbd8b22efb Fix setting value when not empty 2021-03-30 14:28:17 -04:00
Isaac Connor 78c5531357 Increase width of LabelFormat to fit our default. Incrase various number inputs to fit up/down arrows 2021-03-30 13:32:02 -04:00
Isaac Connor 8582c1a652 Once again fix saving string value to '' so that we can empty LabelFormat 2021-03-30 13:31:26 -04:00
Isaac Connor beb7a75d5a Implement canView for Monitors 2021-03-30 11:52:04 -04:00
Isaac Connor aeb98ec790 Implement canView for Groups. Implement Monitors() and Children() functions. Use canView when populating Group dropdown 2021-03-30 11:51:52 -04:00
Isaac Connor c7754e5be8 Default to port 5900 2021-03-30 11:37:00 -04:00
Isaac Connor 8c6f03a4e4 Move waiting for decoding down into motion detection section. Add a test for successful decode. Decode may not provide an image. 2021-03-30 09:16:45 -04:00
Isaac Connor 3202db1b33 Move waiting for decoding down into motion detection part, which is what needs it. Not sure why it was up so high. This should allow more ram freeing for people with analysis fps set to something. 2021-03-30 09:16:44 -04:00
Isaac Connor 0bfbdd6121 Use our new CODEC define to cleanup the code 2021-03-30 09:15:28 -04:00
Isaac Connor d3ed11cc5b add a simple define to make codec/codecpar access easier 2021-03-30 09:15:28 -04:00
Isaac Connor 1c7ae103ea receiving a signal is not a reason to fail a capture. It is a reason to retry 2021-03-29 18:01:10 -04:00
Isaac Connor 0a364f3b80 fix weird logic in ReadData 2021-03-29 11:54:55 -04:00
Isaac Connor 6c428c0156 Properly print out timeval 2021-03-29 09:58:09 -04:00
Isaac Connor 9463cf8565 I can't imagine what fps_report_interval has to do with event being longer than section_length. Use analysis_image_count in log 2021-03-29 09:57:57 -04:00
Isaac Connor e9641938f0 Fix eslint 2021-03-27 18:25:04 -04:00
Isaac Connor 839498061b
Merge pull request #3202 from pmccarty/zmvncfix 
Fix logic to detect libvnc shared library.
 2021-03-27 15:57:25 -04:00
Isaac Connor 96e641b381 handle if error message doesn't exist 2021-03-27 13:42:00 -04:00
Isaac Connor 4ee3380e3a If auth is not turned on, redirect to console 2021-03-27 13:41:49 -04:00
pmccarty e3349c54fa Fix logic to detect libvnc shared library. 2021-03-27 10:58:30 -04:00
Isaac Connor 1d99bd5cb3 Merge branch 'max_queue_size' 2021-03-26 17:03:52 -04:00
Isaac Connor 1275948744 add cast to fix compile 2021-03-26 17:03:49 -04:00
Isaac Connor 3d13daaf25 Bump version for 1.35.22 2021-03-26 17:03:27 -04:00
Isaac Connor 4e9a5cff8e Style MaxImageBufferCount 2021-03-26 17:02:38 -04:00
Isaac Connor 8e1b2ccbc7 Add MaxImageBufferCount 2021-03-26 17:02:17 -04:00
Isaac Connor 617264432e Add help for ImageBUfferCount and MaxImageBUfferCount 2021-03-26 17:02:03 -04:00
Isaac Connor 8e40067d13 Update locks 2021-03-26 17:01:45 -04:00
Isaac Connor 569efd8471 Add MaxImageBufferCount and udpate values as appropriate in update script 2021-03-26 14:32:06 -04:00
Isaac Connor 2e675a338b remove estimated ram use stuff as it is no longer possible 2021-03-26 14:31:18 -04:00
Isaac Connor badb1c6131 Add MaxImageBufferCount, remove estimated ram us 2021-03-26 14:31:04 -04:00
Isaac Connor 52cb182ae3 Load max_image_buffer_count in monitor and set it in packetqueue. rename max_video_packet_count to pre_event_video_count in packetqueue and adjust logic. When queuing packets check to ensure that we aren't going over. Delete packets from front if possible, do not queue packet if not possible 2021-03-26 14:26:37 -04:00
Isaac Connor 3655b25b7c spacing 2021-03-26 08:16:26 -04:00
Isaac Connor c78e6a7cc7 Fix scroll bars on options view 2021-03-26 08:16:15 -04:00