SteveGilvarry
dd59a05165
Resolve SegFault on videostore
2014-11-08 13:06:23 +11:00
SteveGilvarry
7f530bcc2a
Removed duplicate code and brackets
2014-10-12 22:12:54 +11:00
SteveGilvarry
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
Isaac Connor
1076a621c8
fix crashes
2014-09-08 16:56:40 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
83870b911d
debugging in progress but builds
2014-08-21 11:53:14 -04:00
Isaac Connor
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
Isaac Connor
7147d47a76
Improve error messages when empty mmap file to reduce FAQ
2014-07-29 09:45:19 -04:00
Isaac Connor
585a1c50a1
Merge branch 'nommap'
2014-07-24 14:40:37 -04:00
Isaac Connor
4f694ee8cf
fix
2014-07-14 13:07:23 -04:00
Isaac Connor
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
Isaac Connor
9385471392
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-07-13 16:39:27 -04:00
stevegilvarry
17d7404c93
Merging master again
2014-06-28 22:50:28 +10:00
Isaac Connor
07dbbd46d3
only do mmap on demand
2014-06-26 14:54:47 -04:00
stevegilvarry
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
m-bene
f62afdb8cc
add select list for rtsp method for ffmpeg and libvlc
2014-05-17 20:41:22 +02:00
m-bene
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
Kfir Itzhak
3eee90f811
Fix wrong no signal color bug introduced in zm v1.26. Thanks to forum user jcrews for spotting this
...
http://www.zoneminder.com/forums/viewtopic.php?f=30&t=21876
2014-04-23 13:27:43 +03:00
Kfir Itzhak
3cee6a133d
Merge remote-tracking branch 'Sune1337/motion/FrameSkip'
...
Conflicts:
db/zm_update-1.27.1.sql
web/lang/nl_nl.php
2014-04-22 20:13:11 +03:00
Sune1337
a8a0bf922f
Move initializer for last_motion_score to avoid compiler warning "...zones will be initialized after ... last_motion_score ... when initialized here"
2014-04-10 15:53:28 +02:00
Sune1337
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
m-bene
26777487dc
add feature to extend preclusive zone alarm state by x frames
2014-03-09 17:05:39 +01:00
Kfir Itzhak
bf708a8373
Merge branch 'master' into curl
...
Conflicts:
CMakeLists.txt
src/CMakeLists.txt
src/zm_camera.h
src/zm_monitor.cpp
web/skins/classic/views/console.php
web/skins/classic/views/monitor.php
2013-12-27 14:21:12 +02:00
Edward Barnard
3321506b45
Working libvlc camera implementation.
2013-12-19 21:51:39 +00:00
Kfir Itzhak
c1970a51e3
Fix few errors and syntax errors regarding curl
2013-11-04 17:10:07 +02:00
Kfir Itzhak
8e96df7643
Initial work on adding cURL to zoneminder
2013-11-04 16:52:21 +02:00
Kfir Itzhak
408cac5120
Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now)
2013-11-04 09:11:33 +02:00
Kfir Itzhak
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
Chris Wiggins
9dc19fa32b
Actually store video_data in the correct memory location
2013-09-29 12:55:42 +13:00
Chris Wiggins
35468a5b9c
Tidy up starting and stopping of recording
2013-09-28 23:22:58 +12:00
Chris Wiggins
938f81c753
Add snapshot.jpg to event directory if we are doing a video recording
2013-09-28 23:17:22 +12:00
Chris Wiggins
65afc830b1
Save a snapshot image alongside the h264 video for thumbnail and poster use
2013-09-28 18:50:54 +12:00
Chetan Chauhan
9e7cd026eb
Enable record support for non-h.264 camera's
2013-09-25 13:58:53 +00:00
mastertheknife
5a9364703c
a better fix for the sign comparison warnings during compilation
2013-09-17 10:28:59 +03:00
mastertheknife
c3f7af7cd1
Fix sign warning during compilation
2013-09-15 04:13:09 +03:00
Chris Wiggins
42e37e7e25
Add video playback to events. Very crude at this stage but it works
2013-09-14 04:50:51 +12:00
Chris Wiggins
774a84d487
Updated event processing to actually add frames into the DB. Use MP4 container
2013-09-14 00:50:54 +12:00
Chris Wiggins
c61029f780
First iteration of h264 saving in the capture daemon.
...
To use, enable use_mkv_storage in the paths section of the ZM config (be sure to import the new SQL config)
Must have the latest FFMPEG compiled from git with x264 linked in
2013-09-06 15:07:46 +12:00
Kyle Johnson
ee251b3c02
Removing lingering references to UsedPl
2013-08-13 12:34:59 -04:00
Kyle Johnson
0ec6622a9e
Cleaning up some build errors regarding Native Motion Detection
2013-08-13 09:59:30 -04:00
Kyle Johnson
1888bec092
Doing my best to manually remove nextime's plugin architecture while keeping his other changes.
2013-08-13 09:43:23 -04:00
Isaac Connor
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
nextime
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
Kfir Itzhak
0fe55a18bf
Something useable :)
...
1) Added optimized versions of four field deinterlacing, including SSSE3 ones.
2) Removed the "Very Soft" and "Very Hard" options.
3) Deinterlacing happens before any rotation to the image.
2012-07-15 17:30:37 +03:00
Kfir Itzhak
a6c7acd02a
Some more progress on the deinterlacing code.
2012-07-13 20:11:16 +03:00
Kfir Itzhak
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
Kfir Itzhak
8f0ec42ba2
First work on adding built-in deinterlacing to ZM.
2012-07-13 20:11:16 +03:00
Kfir Itzhak
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
Kfir Itzhak
115db01f8c
Few changes:
...
1) Fixed buffer overflow occurring if JPEG quality is set to 100.
2) Changed linked monitors alarm behaviour again.
3) Fixed extremely poor blend performance on some processors such as the Intel Atom.
4) Added optional profiling code for Blend() and Delta().
2012-02-09 12:23:45 +02:00
