395e628541
Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-29 07:57:18 -05:00
2aca87654a
Remove unneccessary parameter in constructor
2015-08-26 07:44:50 +02:00
a2d7ac86fe
add rtsp_describe to RtspThread class
2015-08-21 10:29:54 -05:00
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
fc50b38331
collect variable name
2015-08-20 16:02:29 +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
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
2600b96f1b
fix merge conflict in zm_monitor.cpp
2015-08-18 14:19:46 -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
99c8af4a17
Bring up to date with master (mostly)
2015-08-17 22:52:51 -04: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
a36bee3767
Merge pull request #984 from Linwood-F/507-shared-data-for-purpose-query-warning
...
Remove shared data warning for purpose query only
2015-08-04 10:09:59 -04:00
546b0dd353
Remove shared data warning for purpose query only
2015-08-03 20:37:17 -04:00
46b9bd5d1c
change the captured image size to camera image size check to be a > instead of !=. As long as we have enough buffer space, it doesn't matter if the captured image is smaller than what we defined.
2015-07-31 10:29:53 -04:00
f7cfa1ecd4
Fix analysis sample rate calculation
2015-07-28 23:07:02 +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
9e16c8a066
Improve log message and logic in UpdateAdaptiveSkip()
2015-07-24 01:01:51 +02:00
3b2378c21d
Add a new warning in GetAnalysisRate function
2015-07-24 00:26:53 +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
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
12516da3dc
Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
...
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
79398a2bec
Merge pull request #821 from onlyjob/PBP
...
beautifying *.pm
2015-05-08 08:56:01 -04:00
209f23cc6e
Fix build issues on kFreeBSD. Fixes #771
2015-04-20 12:53:02 -04:00
eddada011c
spelling corrections (thanks, /usr/bin/codespell)
2015-04-19 20:38:23 +10:00
e4e2160bf6
Don't trigger linked cameras on new events
2015-03-31 13:22:02 -04:00
550d517701
sigh... fix the image to capture_image
2015-02-22 16:36:01 -05:00
2f3104aada
fix debug line
2015-02-22 16:29:36 -05:00
3e33bc2627
This is actually from freebsd... but it's just a more informative error message
2015-02-22 15:01:32 -05:00
facda38871
add corresponding free
2015-01-13 19:52:15 -05:00
509de3ec27
need to cast malloc, get rid of perl code, only swap_path checks if we are going to use it
2015-01-13 15:16:38 -05:00
c313e2e389
Fix a memory leak in Monitor::Analyse()
2014-11-29 06:06:10 +01:00
790005c155
Include monitor name in log otput so we know which monitor we are talking about. This informaton is not included when the error occurs in zms.
2014-11-19 12:42:05 -05:00
1076a621c8
fix crashes
2014-09-08 16:56:40 -04:00
9a3b685016
fixes for vl_multi_buffer parsing when column is NULL
...
fix in debug output for local cameras causing a segfault
2014-09-08 15:20:35 -04:00
6aa1798293
fix segfault for local cameras... strangely enough, in C you should treat an integer as a pointer to string
2014-09-07 17:18:29 -04:00
83870b911d
debugging in progress but builds
2014-08-21 11:53:14 -04:00
5bc7242582
spaces vs tabs are important in rules, debian is more picky than ubuntu
...
fix placement of an if to prevent accessing unmapped mem_ptr
2014-08-19 09:11:49 -04:00
7147d47a76
Improve error messages when empty mmap file to reduce FAQ
2014-07-29 09:45:19 -04:00
585a1c50a1
Merge branch 'nommap'
2014-07-24 14:40:37 -04:00
4f694ee8cf
fix
2014-07-14 13:07:23 -04:00
99a3684fb5
change the way v4l_multi_buffer is loaded. Since t's a bool, it theoretically is 1 byte, so can't use atoi
2014-07-14 12:53:48 -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
f62afdb8cc
add select list for rtsp method for ffmpeg and libvlc
2014-05-17 20:41:22 +02:00
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
Andy Bauer
Robin Daermann
Andrew Bauer
Linwood-F
Isaac Connor
Isaac Connor
Emmanuel Papin
Rick Sayre
Isaac Connor
Dmitry Smirnov
balr0g
m-bene