1e52a8ad2c
remove unused class member
2016-03-24 09:44:34 -04:00
6ff4e333b4
Merge branch 'fix_warnings' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-10-02 15:34:05 +00:00
8125ef0334
change types and move things around to remove compile warnings
2015-10-02 09:49:09 -04:00
75919c9cd5
Merge branch 'master' into multi-server
...
Conflicts:
docs/installationguide/ubuntu.rst
misc/apache.conf.in
src/zm_monitor.cpp
2015-08-27 10:34:47 -04:00
2aca87654a
Remove unneccessary parameter in constructor
2015-08-26 07:44:50 +02:00
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
6fc4525784
Blacken Zones are now correctly displayed
2015-08-20 15:01:07 +02:00
8f9ed96585
First try to implement blacken areas for monitors
2015-08-20 14:20:41 +02:00
41637278c9
merge master
2015-08-19 16:08:12 -04:00
12da43afe7
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 14:01:28 -04:00
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04:00
fe3595bfa1
Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_update-1.28.101.sql
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 20:20:53 -05:00
68adcc9e67
Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 14:07:38 -05:00
59c1b83d4f
create embed_exif flag in Monitor class
2015-08-16 17:42:12 -05:00
7f3a07f21b
Add label size to monitor options (database and backend part)
...
This commit bumps version to 1.28.101 because of database schema change
2015-08-10 15:35:18 +02:00
93990b253f
Use a dedicated pre event buffer if analysis_fps is set
2015-07-27 16:24:32 +02:00
0bff99f5c7
Improve string conversion and use unsigned type for analysis_update_delay
2015-07-25 13:38:50 +02:00
649a39b372
Replace analysis interval parameter by analysis framerate
2015-07-23 16:36:30 -04:00
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
a6b7c6e99f
Add analysis interval parameter to monitors
2015-07-21 22:52:52 +02:00
dfd3d2c4cd
use std::string to build sql for loading monitors. ALso use new ZmDbFetch functions
2015-07-20 16:28:21 -04:00
3c5a9b796b
Merge branch 'master' into zms_no_crash
2015-07-03 11:34:42 -04:00
0308baabb3
This change uses a member Image instead of constantly allocation a new Image.
...
This saves all the initialisation and the lines of debug.
Also in GetImage we potentially remove and entire copy if no scaling or timestamping is being done.
2015-06-03 15:10:52 -04:00
4394bb0a9a
Make zms not crash when zmc is not running.
2015-02-22 16:58:15 -05:00
346015f472
Fix some indentations in zm_monitor.h
2014-11-29 14:39:57 +01:00
c313e2e389
Fix a memory leak in Monitor::Analyse()
2014-11-29 06:06:10 +01:00
585a1c50a1
Merge branch 'nommap'
2014-07-24 14:40:37 -04:00
9385471392
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-07-13 16:39:27 -04:00
07dbbd46d3
only do mmap on demand
2014-06-26 14:54:47 -04:00
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
6c637947e2
Ability to skip frames in motion detection.
...
The reason for this is to make it possible to reduce CPU-load if split-second motion detection is not required.
2014-04-10 14:59:34 +02:00
833705b613
Added alarm blend percent (useful for controlling how long an alarm lasts) and a dropdown list is used now if ZM_FAST_IMAGE_BLENDS is enabled
2013-11-03 10:26:04 +02:00
36d94d160f
Change zm_monitor.h mem_size from long to unsigned long. Fixes #226 .
2013-10-30 09:18:13 -04:00
2c04690865
Allow larger shared memory sizes. Fixes #226
2013-10-30 08:39:24 -04:00
1888bec092
Doing my best to manually remove nextime's plugin architecture while keeping his other changes.
2013-08-13 09:43:23 -04: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
f27b424503
Much more progress!
...
1) Removed the V4L2_CAPTURE_FIELDS option.
2) V4L2 Interlacing control options added to the new per-monitor deinterlacing option.
3) Fixed the 32bit version of Linear.
4) Added Blend (50%) and Blend (25%).
5) Completed the grayscale version of the Four Field Motion Adaptive deinterlacing algorithm.
2012-07-13 20:11:16 +03:00
8f0ec42ba2
First work on adding built-in deinterlacing to ZM.
2012-07-13 20:11:16 +03:00
0932f50d80
1) Added the image size and format to the shared memory. This is useful for viewer applications relying on the shared memory.
...
2) Small changes to improve the response time of the DVR controls. Going through frames in a paused event is now much faster.
2012-03-22 08:30:57 +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
b0bc227232
1) Made shared memory 16 byte aligned and identical size and layout for all platforms.
...
2) Fixed a bug in zmwatch.pl: Not freeing shared memory handles between iterations.
3) Modified default monitor options to simplify new monitor creation.
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
5c418133bf
Lots accomplished!
...
1) Delta and blend SSE and standard alogirthms inside
2) Changed event streaming to use sendfile() syscall if available
3) Direct memory capture (Less memcpys required)
4) Added macros for BGR24 and RGB32(and its variants) formats
5) Modified Monitors database table to add a target colorspace option
6) Changed most image buffer allocations to be on 16 byte boundary, work still in progress
7) Added Target colorspace instead of the old colours selection. this one also visible to local cameras
8) Replacing Y deltas option with ZM_CPU_EXTENSIONS
9) Added SSE detection code
10) Changed some code to make linking success with inlining enabled.
11) Some other changes and work still in progress for some listed above
2012-02-01 07:33:20 +02:00
8048c1c355
Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 21:59:06 +00:00
20580582b3
Minor header file reorg
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2811 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-23 21:56:30 +00:00
d92c781026
Removed mapped memory file on shutdown.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2755 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 21:32:00 +00:00
c753214450
Added some conditional compilation around ffmpeg stuff.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2733 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 15:02:33 +00:00
dde584a12a
Restructured camera capture methods somewhat and revamped V4L stuff a bit.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2724 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 09:48:06 +00:00
bb872feab4
Added result error checking to frame streaming.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2718 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-21 17:37:39 +00:00
Isaac Connor
Isaac Connor
Robin Daermann
Andrew Bauer
Emmanuel Papin
m-bene
Sune1337
Kfir Itzhak
Kyle Johnson
Isaac Connor
nextime
stan