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
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
0da03ca5e8
braces/whitespace
2017-05-20 09:41:13 -04:00
654282d82e
fix merge
2017-03-17 09:41:04 -04:00
d9c665b021
Merge branch 'fix_crash_with_invalid_zones' into storageareas
2017-03-17 09:35:11 -04:00
6a447194eb
Fix zmc crashing when zones are no good bby decreasing n_zone before continuing
2017-03-16 10:55:13 -04:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
a5b7b6e74f
move the input packet into a member of the camera. Fix packet copying in packetqueue. Implement separate start pts and dts for audio and video
2016-09-22 10:43:20 -04:00
15569d4f33
whitespace, commenting, cleanup some Type castings, init zones[i] to null, because it might not get assigned a Zone object.
2016-09-09 10:07:13 -04:00
45fadaf297
Use Monitor Id instead of Name when writing diag images. The name symlink might not exist
2016-07-26 13:08:32 -04:00
e64376ed02
increase debug level for Zone motion detection
2016-05-05 14:51:41 -04:00
03b1ced568
tabs to spaces and use 2space indenting
2016-04-04 10:11:48 -04:00
7588f6088f
change method from getPath to Path
2015-12-15 13:27:18 -05:00
010d7b3d64
convert to using storage->getPath instaed of config.events_dir
2015-12-15 11:11:34 -05:00
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
8f9ed96585
First try to implement blacken areas for monitors
2015-08-20 14:20:41 +02:00
2c1a02ade6
Add was_alarmed property and WasAlarmed method to Zone
2015-02-18 16:34:35 -05:00
c6d19b3ecf
whitespace issue
2014-08-21 11:14:38 -04:00
26777487dc
add feature to extend preclusive zone alarm state by x frames
2014-03-09 17:05:39 +01:00
b368d306b9
Fix marker-out-of-bounds crash when defining zone points
2013-11-02 15:56:42 -07:00
aef9ab2f00
Removed NumCoords entirely from zm_zone.cpp
2013-09-24 07:41:37 +03:00
ac7f7f08a7
Fix some compilation warnings
2013-09-24 07:31:02 +03:00
cdac403fb1
Merge ../zum into develop
...
Conflicts:
AUTHORS
configure.ac
db/zm_create.sql.in
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/zmupdate.pl.in
src/Makefile.am
src/zm_buffer.cpp
src/zm_config_defines.h
src/zm_event.cpp
src/zm_ffmpeg.h
src/zm_ffmpeg_camera.cpp
src/zm_image.cpp
src/zm_jpeg.h
src/zm_local_camera.cpp
src/zm_logger.cpp
src/zm_mem_utils.h
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_mpeg.cpp
src/zm_remote_camera_http.cpp
src/zm_remote_camera_rtsp.cpp
src/zm_rtsp.cpp
src/zm_sdp.cpp
src/zm_sdp.h
src/zm_stream.cpp
src/zm_thread.cpp
src/zm_thread.h
src/zm_threaddata.cpp
src/zm_user.cpp
src/zm_user.h
src/zm_utils.cpp
src/zm_zone.cpp
src/zm_zone.h
web/includes/actions.php
web/lang/big5_big5.php
web/lang/cn_zh.php
web/lang/cs_cz.php
web/lang/de_de.php
web/lang/dk_dk.php
web/lang/en_gb.php
web/lang/es_ar.php
web/lang/et_ee.php
web/lang/fr_fr.php
web/lang/he_il.php
web/lang/hu_hu.php
web/lang/it_it.php
web/lang/ja_jp.php
web/lang/nl_nl.php
web/lang/pl_pl.php
web/lang/pt_br.php
web/lang/ro_ro.php
web/lang/ru_ru.php
web/lang/se_se.php
web/skins/classic/js/skin.js
web/skins/classic/views/js/monitor.js.php
web/skins/classic/views/monitor.php
web/skins/classic/views/zone.php
2013-07-25 11:49:55 -04:00
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
e413042cdb
Fixed a longtime bug in my version that caused distorted analysis images in some setups.
2012-04-01 13:03:18 +03:00
8e9ccfe1ec
Removed the now unused SSE2 AlarmedPixels code.
2012-02-01 07:33:21 +02:00
d7e9c6ad5c
Analysis image finally working!
2012-02-01 07:33:21 +02:00
e217e99562
1) Fixed wrong alarm colour in analysis images.
...
2) Added GCC's target attribute to remove the need for -msse2.
2012-02-01 07:33:21 +02:00
28e06e935b
1) Fixed blob motion detection issues.
...
2) Some more progress towards getting analysis images working.
3) Fixed possible log corruption because of ssedetect().
2012-02-01 07:33:21 +02:00
66f5d7c2f1
Added #defines to control the inclusion of the SSE code.
2012-02-01 07:33:21 +02:00
ca57ae6438
1) Fixed and refinished the JPEG and MJPEG capture palettes support.
...
2) Added the SSE2 alarmedpixels code, although its unused at the moment.
3) Small changes in libjpeg interaction.
4) Small other changes.
2012-02-01 07:33:21 +02:00
eeaed7ccd3
Some small changes
...
1) Fixed wrong size calculation in Image::AssignDirect.
2) Improved libjpeg subpixel order selection.
3) Finished adding support in the simple Overlay function.
4) Completed Flip and Rotate 32bit RGB support.
5) Allow ZM to compile on 32bit with omit frame pointer disabled by defining _DEBUG
To use one less register in the SSE algorithms.
6) Removed the counter variable in some loops to reduce loop overhead.
7) Modified crop query error handling.
8) Most of the shared data now declared as volatile.
9) Small improvements to the AlarmedPixels motion detection.
10) Changed the default blend percent from 7% to 12%.
11) Fixed an earlier bug created by me: motion detection checking the wrong pixels.
2012-02-01 07:33:20 +02:00
1afe0bbf42
1) Added back the colour SSE2 delta algorithms
...
2) Modified SSE algorithms to use one less register
3) Fixed AlarmedPixels motion detection
2012-02-01 07:33:20 +02:00
642a1bfdb2
1) RTSP support for direct capture and target colorspace.
...
2) Hopefully fixed the mmap unexpected shared memory size completely this time.
3) Added 32bit RGB and grayscale support to the signal checking.
4) Fixed zms\nph-zms keeps running after changing capture options, eating CPU and has to be killed with -9.
5) Default monitor options changed again.
6) Fixed unrelated bug: Undefined constant ZM_V4L2 in monitor probe.
7) Fixed unrelated bug: Error in offset X in monitor probe.
8) Changed monitor probe's prefered capture settings.
9) Small other minor changes.
2012-02-01 07:33:20 +02:00
4a59761bcc
Getting closer and closer everyday.
...
1) Fixed many errors to get it to compile
2) Fixed some small bugs
3) Small other changes
2012-02-01 07:33:20 +02:00
Isaac Connor
Isaac Connor
Isaac Connor
Andrew Bauer
Andy Bauer
Isaac Connor
Isaac Connor
Robin Daermann
m-bene
David Nesting
mastertheknife
Isaac Connor
nextime