ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,460 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

164 Commits

Author SHA1 Message Date
Andrew Bauer fb698a6755 Merge remote branch 'nagyrobi/patch-23' into nagyrobi 2014-02-26 09:17:14 -06:00
Kfir Itzhak b2a65dc343 cURL minor corrections and improvements 2014-01-10 09:17:12 +02:00
Kfir Itzhak 9901ce9e84 Merge remote branch 'origin/master' into curl 2014-01-05 10:16:01 +02:00
Kfir Itzhak f9c8b4760b Merge remote branch 'origin/master' into video 2014-01-05 09:02:11 +02:00
Kfir Itzhak a962815624 Change default alarm blend percent to 6 and make upgrades smooth by copying the existing blend percent to the alarm one 2014-01-05 08:59:09 +02:00
Kfir Itzhak ff9a26273c cURL is now working! 2013-12-27 18:02:32 +02: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
Kfir Itzhak e652441996 Merge remote-tracking branch 'origin/master' into video 
Conflicts:
	configure.ac
	src/CMakeLists.txt
 2013-12-26 21:03:45 +02:00
Kfir Itzhak 8ae387e376 Few minor code improvements 2013-12-22 15:19:55 +02:00
Edward Barnard 3201e5a431 Adds web ui support for libvlc camera. 2013-12-19 21:51:39 +00:00
Kfir Itzhak 2b79ff2cbd Initial commit for saving events as videos :) 2013-12-19 18:38:07 +02:00
Isaac Connor 3393a63525 more updates 2013-12-17 12:53:15 -05:00
Isaac Connor 79b3f16635 add storage tab 2013-12-15 15:37:41 -05:00
Kyle Johnson f39f2fab66 Merge pull request #241 from ZoneMinder/alarmrefblendoption 
Add alarm reference image blend percentage option and replace the text field if fast blends are enabled
 2013-12-13 10:13:34 -08:00
Kfir Itzhak e9f4479171 Added support for UYVY capture palette (required for some Bluecherry cards) 2013-12-10 15:13:48 +02:00
Kfir Itzhak f73585dbaa Few web interface corrections regarding cURL 2013-11-04 17:28:15 +02:00
Kfir Itzhak 8e96df7643 Initial work on adding cURL to zoneminder 2013-11-04 16:52:21 +02:00
Kfir Itzhak fd656c55cf Changed default blend percentages and the dropdown list for alarm reference image blend 2013-11-04 12:10:53 +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
Isaac Connor 2a45506bff more quoting removal 2013-10-17 16:15:04 -04:00
nagyrobi a186981278 Update monitor.php 
Enable localization of the monitor function names in the monitor settings window.
 2013-08-16 13:48:25 +02:00
Kyle Johnson ee251b3c02 Removing lingering references to UsedPl 2013-08-13 12:34:59 -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 b4921c4403 1) Made 24bit the default target colorspace. 
2) Changed crop info's layout.
 2012-02-01 07:33:21 +02:00
Kfir Itzhak 066fe89718 Added automatic capture palette selection. 2012-02-01 07:33:21 +02:00
Kfir Itzhak bdf0687550 1) Added support for JPEG and MJPEG capture palettes - needs to be tested 
2) Allow the blend percent to be zero, to disable blending
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 8ac3dda54b 1) Removal of the ZM_LOCAL_BGR_INVERT option. 
2) Allow FPS reporting interval to be zero again.
3) Added translation for the new texts.
4) Corrected the blend function declaration.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 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
Kfir Itzhak 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
Kfir Itzhak 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
Kfir Itzhak c3ecdd00e0 1) Relocated conversion functions and tables to zm_image.cpp 
2) SSE2 aligned memcpy now functional
3) Fixed fill functions bug from an earlier commit
4) Many changes to zm_local_camera.cpp format selection
5) Fixed memory leak in AssignDirect()
6) Fixed Target Colorspace webinterface issues
7) Small other changes
 2012-02-01 07:33:20 +02:00
stan f0a012ebfd Fixed bug to do with V4L versions and monitor settings 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3307 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-03-02 12:04:52 +00:00
stan 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
stan 6f464e7152 Changed use of deprecated split function to explode 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3023 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-15 17:11:17 +00:00
stan 1fad2d7ec9 Changed query separator to & and miscellaneous html fixes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2982 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-16 17:09:16 +00:00
stan 3c10237833 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2905 e3e1d417-86f3-4887-817a-d78f3d33393f 2009-05-28 08:47:59 +00:00
stan 62503acd16 Added monitor probe facility 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2829 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-31 13:00:49 +00:00
stan 54dc3b9668 Improved monitor naming checks and validation. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2826 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-31 10:55:19 +00:00
stan 3310ea3ae9 Added V4L version to presets and generic PAL/NTSC standards 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2823 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-30 12:00:14 +00:00
stan 8cc598d2f8 Fixed issue with default V4L version being v2 but default options displayed were for v1 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2758 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-12 22:44:11 +00:00
stan e0310c0760 Commented out some V4L2 palette options. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2730 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-28 12:50:58 +00:00
stan 21d8d74a28 V4L2 updates 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2723 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-27 11:07:24 +00:00
stan b3b226ebe1 Changed labels to work better with ffmpeg monitors. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2720 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-21 17:45:30 +00:00
stan 23d82a7e03 Added FFMPEG camera type 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2716 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-20 15:01:32 +00:00
stan 50f60ab9d8 Added in conditional regexp http support 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2693 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-05 18:45:01 +00:00
stan b7f97d388f Added configuraion and detection of V4L2 to web interface. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2678 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-28 14:25:12 +00:00
stan d2856ed019 Fixed issues with control capabilities and moveMap on watch view. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2648 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-05 19:58:13 +00:00
stan 5bfe4b72c7 Fixed typo. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2637 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-29 11:42:59 +00:00
stan ef8f7b85fd Continuing development and bugfixes 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2632 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-26 09:47:20 +00:00
stan ba788cc001 Fixed issues with creation, editing and deletion of monitors. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2626 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-01 16:43:34 +00:00
stan 31a0762d9e Fixed issues with remote method not being preserved. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2622 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-01 14:59:02 +00:00
stan 0c2edfef4a Corrected selection of LinkedMonitors. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2619 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-01 14:03:52 +00:00
stan 106882c161 Updated copyright notices 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-25 09:48:16 +00:00
stan 3fc9360255 Fxed MaxFPSs defaulting to 0.00 when not set. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2589 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-21 21:28:50 +00:00
stan 6880f9e2bb Removed unrequired Colours field 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2585 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-21 15:24:46 +00:00
stan 77fd8dafbf Added in better colour/palette initialisation for new monitors. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2581 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-21 15:19:25 +00:00
stan 03c66f87ef Fixed up tabs 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2574 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-18 14:53:44 +00:00
stan bfd67f69fd Fixed to work properly with MPEG cameras and presets 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2537 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-16 08:40:21 +00:00
stan 2824cb7355 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-14 13:54:50 +00:00