8d52baeee2
Merge branch 'master' into rtsp_server
...
Cleanup Analysis a bit. We can't skip packets just because they are audio. Clean up the state machine transitions a bit to make them a little more readable.
Change logic of PrimeCapture, success MUST return 1. 0 means no error but also no success.
Debugging and braces improvements in local_camera.
2020-12-17 10:16:54 -05:00
46bbbb7dff
Merge branch 'fix_zone_instead_of_ignore'
2020-12-15 16:33:58 -05:00
a88ccf793b
correct zone points instead of skipping zone
2020-12-15 16:32:19 -05:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
ae4e2a1d5e
We were overwriting the privacy/inactive zone with a more general one. Slight memleak
2020-11-19 10:42:17 -05:00
de74a15ab1
Move diag_fifo pipes in SOCKS_DIR instead of assigned Storage area. Storage areas could be a fs that cannot handle sockets or fifos like NFS.
2020-11-12 11:53:51 -05:00
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
387f5dd397
Fix double free of image
2020-10-02 12:47:05 -04:00
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
795e98a09c
Merge pull request #2916 from connortechnology/zone_optimise
...
Improve code in zm_zone
2020-09-22 17:48:24 -04:00
8f980a1168
Convert NULL/0 to nullptr
...
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
e5e2c3b347
fix stats off by 1 frame, don't alert on score 0
2020-08-24 10:57:54 -05:00
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
f635afe00f
spacing
2020-07-22 17:30:39 -04:00
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
d716d1d686
Merge branch 'release-1.34'
2020-07-20 16:25:41 -04:00
01892352da
rename sseversion to sse_version
2020-07-19 17:50:47 -04:00
dcab218a2e
remove global config item CREATE_ANALYSIS_IMAGES
2020-07-06 12:22:41 -05:00
ae9a5766f5
Merge branch 'release-1.34' into fix_zms
2020-04-26 18:19:30 -04:00
37c829f2bf
cleanup code a bit. Move BlobStats to the Zone Object so that it isn't constantly being allocated/freed from the heap. Improve ParsePolygon.
2020-04-20 11:19:33 -04:00
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
9713d908fb
Spacing, google code style and tabs to spaces
2019-06-24 10:28:11 -04:00
eb005e8b9c
FIFO support for zoneminder zone debugging ( #2594 )
...
Adds fifo options for diagnostic images for much lower impact diagnostics mode. Diagnostic images are only written when there is a client listening for them (otherwise they are skipped). Also added a json stream for the detection data so you can see in real time the pixels or blobs detected for the motion. This allows for easy real time stream of both delta and reference images (as video streams) along with the detection numbers.
2019-05-16 15:37:03 -04:00
672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -04:00
d296d59625
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-22 16:34:29 -04:00
d97eea886a
fix scoring algorithim, to use max_alarm_size when specified instead of the size of the zone. ( #2186 )
2018-08-22 12:58:26 -04:00
90eda0b88b
spacing, remove extra parenthesis
2018-08-22 11:14:00 -04:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
8450d532b4
Add STDC_FORMAT_MACROS and include cinttypes so that PRIu64 works on centos7
2018-06-14 12:24:58 -04:00
94377a4652
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:57:50 -04:00
f6139d33ed
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:25:11 -04:00
fb9a12ddba
add locking around loading Zone
2018-05-01 12:19:34 -04:00
18b015903a
cleanup. Google Code Style. Move diag_path from a static to a class member so that multiple zones will create different diag files.
2018-04-23 14:36:46 -04:00
4be64152e8
put mutex around inserting event stats
2018-03-28 09:12:38 -04:00
84b7e85259
Add a mutex around mysql operations
2018-02-15 15:54:13 -05:00
64816aa005
fixes from cppcheck.
2017-11-18 16:00:10 -05:00
ecd86b3fde
cleanup
2017-11-12 15:18:39 -05:00
38a4ca1a6f
use storageareas when outputting zone diag images
2017-09-26 09:33:33 -04:00
9f93bfc23b
use Monitor Id in path to diag images instead of monitor name as the name is a convenience link and not guaranteed to exist
2017-09-25 18:45:58 -04:00
84be41998a
make debug lines more informative
2017-09-25 16:23:27 -04:00
259b7f7655
fix memleak
2017-07-31 15:49:27 -04:00
b886a2daa2
Merge branch 'master' into storageareas
2017-06-14 11:25:02 -04:00
a4b3f6b41a
fix form of delete used
2017-06-14 10:54:21 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
3bfac9faff
Merge branch 'master' into storageareas
2017-06-09 13:00:24 -04:00
90517ed0aa
Merge branch 'master' into add_was_alarmed
2017-05-25 14:01:27 -04:00
a515041e14
Merge branch 'master' into storageareas
2017-05-23 15:17:46 -04:00
5c673d5659
google style
2017-05-23 15:07:50 -04:00
Isaac Connor
Isaac Connor
Peter Keresztes Schmidt
Andrew Bauer
Mitch Capper
vajonam
Isaac Connor