82b32578ec
Merge branch 'master' into iconnor_video
2016-04-01 12:54:09 -04:00
c7e766faef
finish the record_audio constructor defs
2016-03-31 13:30:31 -04:00
2a3ed0c32c
Add record_audio member, also correct whitespace
2016-03-31 12:17:17 -04:00
1e52a8ad2c
remove unused class member
2016-03-24 09:44:34 -04:00
7301e803ed
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2016-01-30 15:45:08 +11:00
d8494aba2d
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11: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
f09a551d6a
Merge branch 'master' into feature-h264-videostorage
2015-07-28 21:06:52 +10: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
ba425edd0f
Convert from event_directory to event file as per Video branch
2015-01-12 20:42:17 +10:00
53c7e02d78
Update VideoStoreData memory size comment
2014-12-25 05:52:34 +11:00
f076104c94
Fix whitespace
2014-12-19 07:19:08 +11:00
bf33eab17c
Merge branch 'video' into feature-h264-videostorage
...
Conflicts:
src/CMakeLists.txt
src/Makefile.am
src/zm_event.cpp
web/skins/classic/views/js/event.js
2014-12-02 20:58:35 +11:00
cc85424999
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg_camera.cpp
2014-12-02 20:18:24 +11: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
69090563d5
Merge branch 'master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-11-28 14:23:05 -05:00
4245928b35
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
web/skins/classic/js/skin.js
2014-10-12 20:10:36 +11: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
17d7404c93
Merging master again
2014-06-28 22:50:28 +10:00
07dbbd46d3
only do mmap on demand
2014-06-26 14:54:47 -04:00
5217bb668a
Merge remote branch 'origin/master' into video
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2014-06-06 09:25:05 +03:00
33090f2264
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
configure.ac
src/zm_config_defines.h
src/zm_ffmpeg.h
web/index.php
2014-05-30 01:55:24 +10: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
8ae387e376
Few minor code improvements
2013-12-22 15:19:55 +02:00
2b79ff2cbd
Initial commit for saving events as videos :)
2013-12-19 18:38:07 +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
Isaac Connor
SteveGilvarry
SteveGilvarry
Isaac Connor
Robin Daermann
Andrew Bauer
Emmanuel Papin
Kfir Itzhak
m-bene
Sune1337