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

19341 Commits

Author SHA1 Message Date
Isaac Connor 452d28a66b Turn off useless shm display in header. Add ram and swap usage 2021-10-14 13:31:35 -04:00
Isaac Connor 26ac52aaa9 Fix scaling the image after changeScale. Limit stream scale to 100, let browser do the scaling 2021-10-14 13:00:49 -04:00
Isaac Connor 086bf7a84f introduce new logic that keeps the initial keyframe and deletes 1 video frame after it to keep the count down. Also any audio frames it encounters. 2021-10-14 12:47:51 -04:00
Isaac Connor 411d15605a We can lockup if MaxImageBufferCount is less than keyframe interval. Give up after 10 tries and drop the packet 2021-10-14 10:08:51 -04:00
Isaac Connor 8a9c283c1c Fix loading importance. Needs to be -1 not -2. The first value is 1, but we want zero based. 2021-10-13 16:06:22 -04:00
Isaac Connor 64ab429519 Correct definition of Importance. Want less importance to have a hgiher value. Make not null. 2021-10-13 16:05:49 -04:00
Isaac Connor 74ac79479f notifying before waiting serves no purpose because we have the lock 2021-10-13 15:02:07 -04:00
Isaac Connor 4fee4d01e3 always correct decoding_enable, as zms needs to know it's correct value 2021-10-13 15:01:46 -04:00
Isaac Connor 00f9cb791c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-10-13 13:43:10 -04:00
Isaac Connor f60282eaf5 Test for existence of AutoEmail and AutoMessage. Fixes #3369 issue 2. 2021-10-13 11:58:22 -04:00
Isaac Connor 6fd33b4627 Change commands used to set and goto presets. Fixes #3371 2021-10-13 10:42:23 -04:00
Isaac Connor 2056172ea9 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-10-12 14:12:20 -04:00
Isaac Connor 126a102426 confirm before tar-gzipping orig. Fix default behaviour in dput prompt 2021-10-12 14:12:16 -04:00
Isaac Connor 0bac052a0a
Merge pull request #3370 from SudoMike/add_benchmarks 
Add a zmbenchmark program
 2021-10-12 13:43:00 -04:00
Isaac Connor 5cdc0efdb8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-10-12 13:22:53 -04:00
Isaac Connor aafec8ead6 Put actions and options in a div, remove hr's and style the resulting div have the borders and clearing required. Make email options 100% 2021-10-12 13:22:41 -04:00
Peter Keresztes Schmidt cd45c61555 Use mt19937 as PRNG 
Reasons: It's faster than rand() and can be made thread-safe
 2021-10-12 19:18:21 +02:00
Peter Keresztes Schmidt c027b7a38d Fix some clang-tidy warnings 2021-10-12 19:05:22 +02:00
Peter Keresztes Schmidt 97b38bd4ab Align changes with our codestyle 
See https://google.github.io/styleguide/cppguide.html for reference
 2021-10-12 18:53:31 +02:00
Isaac Connor c6cac57fb1 remove bogus wanring 2021-10-12 12:45:06 -04:00
Isaac Connor 0ba3d863a6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-10-12 12:25:01 -04:00
Mike Dussault 814124251e Fixed a CodeQL complaint 2021-10-11 23:57:20 +00:00
Mike Dussault 2cf16eb495 Removed some unused code and added more function comments 2021-10-11 15:58:30 -07:00
Mike Dussault 146ff1ac7a Print the benchmark results in a nicer table 2021-10-11 15:53:29 -07:00
Mike Dussault e4542de6f2 Fixed random image generation, and now it shows a proper (giant) perf difference between images that take longer for Zone's FILTERED_PIXELS detection to deal with. 2021-10-11 14:21:08 -07:00
Mike Dussault 9370cfe25c Added TimeSegmentAdder class and got benchmark output looking ok. 2021-10-11 21:12:46 +00:00
Mike Dussault 305af08112 Added Monitor scaffolding and a skeleton benchmark for DetectMotion. 2021-10-11 20:22:10 +00:00
Mike Dussault 3723e136b1 Initial benchmark exe 2021-10-11 19:44:58 +00:00
Isaac Connor 614750963b spacing 2021-10-07 12:37:03 -04:00
Isaac Connor 7079516e09 Fix indexing of camera type enum so that printing out from CameraType_Strings works 2021-10-07 12:36:28 -04:00
Isaac Connor 2dfbc013cb Fix curl cameras. PrimeCapture and PreCapture and PostCapture need to return 1. Also need to populate the packet and video stream. 2021-10-07 12:35:56 -04:00
Isaac Connor 505f3d1b32
Merge pull request #3366 from haade-administrator/patch-1 
Update translation
 2021-10-06 09:11:22 -04:00
Isaac Connor a465403c72 Handle when SERVER['HTTP_HOST'] is not set 2021-10-05 19:49:42 -04:00
Isaac Connor 7f09cddcd7 split actionBrightness etc into two different functions for get/set. This allows negative values to be set 2021-10-05 19:49:42 -04:00
Isaac Connor e394248baf Add ajax controls to realtime change the v4l2 ctrls 2021-10-05 19:49:42 -04:00
Isaac Connor 94cd3a6e69 Use v4l2-ctrl to list the available controls and display all of them. Use range sliders where appropriate. 2021-10-05 19:49:42 -04:00
Isaac Connor 52129c94ec spacing. Use a separate boolean to tell if we have specified a new value for controls. This allows negative settings. Fix zmy outputting brightness when contrast is specified. 2021-10-05 19:49:42 -04:00
Isaac Connor ba26235763 further deprecate v4l2 tests and spacing 2021-10-05 19:49:42 -04:00
Isaac Connor c72d34f176 fix validInt to take negative integers. Introduce validCardinal to handle positive integers 2021-10-05 19:49:42 -04:00
Isaac Connor 75a014321e Spacing, remove tests for v4l2, move control setting/getting code to a single function. 2021-10-05 19:49:42 -04:00
Isaac Connor 1f04723f3a dbError is supposed to take the sql that caused the error. So pass something to satisfy php 2021-10-05 19:49:42 -04:00
haade a0142d3896
Update translation 2021-10-05 08:15:39 +02:00
Isaac Connor 7ed76b5677
Merge pull request #3364 from TheRealJiffy/patch-1 
Update mobile.rst
 2021-10-03 11:08:56 -04:00
TheRealJiffy ca293eb288
Update mobile.rst 
fix broken link
 2021-10-02 23:42:08 -04:00
Isaac Connor 509a5549be Merge branch 'master' of https://github.com/ZoneMinder/zoneminder 2021-09-28 10:31:04 -04:00
Isaac Connor aca477e737 Add warning when MaxImageBufferCount is less than keyframe interval 2021-09-28 10:30:51 -04:00
Isaac Connor 95a7c6c32f fix crash on 32bit pi due to use of %ld instead of %PRId64 2021-09-28 10:29:41 -04:00
Isaac Connor ac375bc623 fix errant = 2021-09-27 11:03:29 -04:00
Isaac Connor f54e779b21
Merge pull request #3360 from ZoneMinder/strftime_en_gb_format 
Define Date formats in lang file for en_gb resolves #2408
 2021-09-27 10:58:43 -04:00
Isaac Connor 202d95fc5a handle AV_HWDEVICE_TYPE_MMAL not being defined 2021-09-27 10:58:16 -04:00