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

924 Commits

Author SHA1 Message Date
Kfir Itzhak cd154e86f2 Remove accidently committed planned crash code in src/zmc.cpp 2013-10-07 02:44:56 +03:00
Kfir Itzhak 0bb2ee7efc More signal improvements: 
1) Cleaner code
2) Fixed the path displayed in the addr2line line
3) Improved dependency checking for backtrace
4) Few more improvements
 2013-10-07 02:37:50 +03:00
Kfir Itzhak b5c536b134 Signal and backtrace improvements 2013-10-06 18:26:33 +03:00
mastertheknife a9e886aea2 Fix small zipped images bug introduced by commit e12a9dc408 2013-10-06 06:35:56 +03:00
Kfir Itzhak 96902c216d Fix comparison sign warning introduced in pull request #174 commit 33b6e5c 2013-10-05 16:42:13 +03:00
mastertheknife e12a9dc408 Fixed compilation failure when zlib is not available 2013-10-04 23:20:39 +03:00
Isaac Connor 34f84a4097 Merge branch 'v1.26.4-beta' 2013-10-03 10:14:09 -04:00
Kyle Johnson 02e1a5eea6 Merge pull request #174 from POKKAHOH/rtsp-updates 
More RTSP support, decoding fragmented NAL, understand sprop-parametr-sets

 * Can now view more RTSP streams (including newer Axis cameras)
 * Decode fragmented NAL
 * Understand sprop-parametr-sets
 * Don't check unsetted video format (zm_remote_camera_rtsp.cpp)
 * Remove #else errors for avutils/ffmpeg
 2013-10-03 05:08:07 -07:00
POKKAHOH b0a014928e remove #else errors for avutils/ffmpeg 2013-10-01 16:05:49 +04:00
mastertheknife 48f11a8064 Add cmake to zoneminder 2013-09-28 12:59:50 +03:00
POKKAHOH 25ff325118 Comment missed in determining stream header. 
Property 'title' and 'comment' not supported.
 2013-09-27 16:51:33 +04:00
POKKAHOH 33b6e5cd03 Now can recive RTSP stream. 
Decode fragmented NAL
Understand sprop-parametr-sets
Don't check unsetted video format (zm_remote_camera_rtsp.cpp)
 2013-09-27 15:08:11 +04:00
mastertheknife dddec742e0 Fixed zm_logger not including zm_config.h first. 2013-09-25 09:00:52 +03:00
mastertheknife e8d20faec8 Proper checking for sys/syscall.h 2013-09-25 07:11:59 +03:00
Raul Almeida f2225f23cd Update zm_thread.h 
As proposed on https://github.com/ZoneMinder/ZoneMinder/issues/170
 2013-09-24 17:07:36 -03:00
Raul Almeida aeed1d4043 Update zm_timer.h 
As proposed on https://github.com/ZoneMinder/ZoneMinder/issues/170
 2013-09-24 17:03:36 -03:00
mastertheknife aef9ab2f00 Removed NumCoords entirely from zm_zone.cpp 2013-09-24 07:41:37 +03:00
mastertheknife ac7f7f08a7 Fix some compilation warnings 2013-09-24 07:31:02 +03:00
mastertheknife c526fcedd7 Fix an issue created by commit 2b568906e5: Log flooded with image dimensions differ errors 2013-09-24 07:15:37 +03:00
Isaac Connor b08a8252c4 Merge branch 'dukess-master' into v1.26.4-beta 
Conflicts:
	scripts/zmupdate.pl.in
 2013-09-18 13:03:54 -04: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
Isaac Connor ab1314f250 clean out autogenerated files 2013-09-12 14:43:57 -04:00
mastertheknife 2b568906e5 Fixed greyscale four field deinterlacing not processing last line, broken ssse3 color->greyscale conversion and improved error handling when reading\decoding jpegs 2013-09-10 18:37:56 +03:00
Isaac Connor 0a9e63ca2c remove autogenerated files 2013-09-06 14:40:55 -04:00
Kyle Johnson c8ad6ae656 Fixes #107 for real this time. 2013-09-05 20:31:52 -04:00
Andy 3764000f81 Fix "Can't stat : No such file or directory" message 
Many zoneminder systems have a "Can't stat : No such file or directory" in their logs each time zmfix is run. The problem was traced back to the sql query, which looked for a ControlDevice field that was not null.  However, the ControlDevice field is empty, rather than null, when there is no control device.
 2013-08-30 14:30:47 -05:00
Andy 4e9698ae13 Fix for Issue #88 - ZMS crashing 
Previously, systems without gnutls were computing auth_md5 to be twice the size of what it was defined to be, thus causing zms to crash. The for loop at line 227 builds auth_md5 by looping every "2j", which means the upper limit (md5len) should be half the desired size of auth_md5.
 2013-08-28 07:22:41 -05:00
Kyle Johnson 35c36bd769 Merge pull request #80 from knnniggett/corruptjpeg 
Suppresses erroneous Corrupt Jpeg messages sent from the jpeg library
 2013-08-20 06:24:20 -07:00
Kyle Johnson de9b1af1a1 Merge pull request #79 from knnniggett/frameserver 
Added frameserver patch from Zoneminder Wiki

Changes the socket reader in zmf from a single read, to a loop read.
Incomplete reads would be reported even though the image writer wrote
the whole image to the socket. The problem was when the read went to
read the image frame from the socket, all the data had not yet been written
to the socket by the writer, so the reader thought there was a problem.
The loop reads from the socket until a full image frame is read, or there is
an error.

Originally at http://www.zoneminder.com/wiki/index.php/1.24.2_Patches
 2013-08-20 06:23:34 -07:00
Knniggett 860c331d58 Suppresses erroneous Corrupt Jpeg messages sent from the jpeg library 2013-08-18 15:01:46 -05:00
Andrew Bauer 31daa32194 Added frameserver patch from Zoneminder Wiki 2013-08-18 13:28:55 -05:00
Kyle Johnson 0a911d9d27 The .deps directory shouldn't have been included. Removing it. 
.deps is generated during configure (or is it make?).  Fixes #52
 2013-08-15 12:44:10 -04: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 c3f468eb8c Fixing zm_image_analyser.h:13:25: fatal error: zm_detector.h: No such file or directory 2013-08-13 09:53:31 -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
Isaac Connor 3a8481a591 cleanup 2013-05-10 14:02:22 -04:00
Isaac Connor 9d89fb3bcb Merge branch 'kfir-proper' into develop 2013-05-10 12:23:58 -04:00
Isaac Connor 7cf5475542 Merge ../ZoneMinder-kfir into kfir-proper 
Conflicts:
	configure
	src/Makefile.am
	src/Makefile.in
 2013-05-02 21:28:51 -04:00
Isaac Connor 044af38cdb match up #if's regarding gnutls-openssl 2013-04-29 16:44:37 -04:00
Isaac Connor ce61512a0d gnutls changes from ubuntu package 2013-04-29 15:32:55 -04:00
Isaac Connor 36f25c7ffb add -fno-inline from ubuntu package 2013-04-29 15:31:55 -04:00
Isaac Connor 1c3f6a9637 fix typos 2013-04-29 13:45:27 -04:00
Isaac Connor 0967797933 add unistd.h to fix compile 2013-04-29 13:44:21 -04:00
Isaac Connor 6db183a5ba add mathetmatics.h to fix compile 2013-04-29 13:43:48 -04:00
Isaac Connor bd5e2da5c7 fix for kernel3.5 2013-04-29 13:29:51 -04:00
Isaac Connor 84370b7fd8 add unistd.h include to fix compile 2013-04-29 12:51:46 -04:00
nextime 8bf1824159 Ok, this time it will work? 2013-04-27 02:17:11 +02:00
nextime 7cb43d0efc Fix a wrong macro.. 2013-04-27 01:10:51 +02:00
nextime 6af58aca09 Fix CodecID changes in recent libav libraries 2013-04-27 00:59:34 +02:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00
Kfir Itzhak 0ef29743f2 Merged the deinterlacing code, although only four field is optimized so far, and is still not working perfectly. 
1) Fixed compile errors that may occur when compiling with gcc 4.7 or newer.
2) Modified the check for libavcodec to work correctly with the latest versions of ffmpeg.
 2012-07-17 12:23:13 +03:00
Kfir Itzhak ed2e3a8ce0 Fixed few compiler errors (unknown registers and such) and modified zm_create.sql to include the new field. 2012-07-17 10:36:21 +03: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
stan 4996dd0a51 Recreated generated files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 09:46:18 +00:00
stan f9022778f7 Fixed template instantiation 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3661 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 09:45:54 +00:00
stan 8dd2bbfc17 Support gnutls md5 generation 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3660 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 09:00:20 +00:00
Kfir Itzhak e413042cdb Fixed a longtime bug in my version that caused distorted analysis images in some setups. 2012-04-01 13:03:18 +03:00
Kfir Itzhak 9dbf00ebd7 A big performance improvement for SSE2 delta (32bit RGB only). Should be useful on processors without SSSE3, such as many AMD processors. 2012-03-22 08:41:17 +02: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 40a8dd9b63 Automatic capture palette selection now displays the selected capture palette in the log (only for zmc). 2012-03-07 15:02:27 +02:00
Kfir Itzhak 2dfdc8129c Few small fixes: 
1) Added a workaround against SWS_CPU_CAPS_SSE2 not being defined.
2) Fixed enableDisableAlarms javascript error.
3) swscale unsupported format errors now include the unsupported format in the error.
4) Fixed a small error affecting local cameras with rotation enabled.
 2012-03-07 14:33:09 +02:00
Kfir Itzhak 8d304972f1 Fix compile error caused by the previous commit. 2012-02-09 13:10:48 +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
Kfir Itzhak 1f072b1a62 Fixed few zma issues related to signal checking and linked monitors. 2012-02-01 07:33:21 +02:00
Kfir Itzhak 2135e58c41 Fixed zma crashes caused by flaky signal and few bugs in mocord mode. 2012-02-01 07:33:21 +02:00
Kfir Itzhak fc1807f433 Fixed possible small stack corruption. 2012-02-01 07:33:21 +02:00
Kfir Itzhak 8e9ccfe1ec Removed the now unused SSE2 AlarmedPixels code. 2012-02-01 07:33:21 +02:00
Kfir Itzhak d7e9c6ad5c Analysis image finally working! 2012-02-01 07:33:21 +02:00
Kfir Itzhak af821828b8 Changed a few warnings 2012-02-01 07:33:21 +02:00
Kfir Itzhak e217e99562 1) Fixed wrong alarm colour in analysis images. 
2) Added GCC's target attribute to remove the need for -msse2.
 2012-02-01 07:33:21 +02:00
Kfir Itzhak 28e06e935b 1) Fixed blob motion detection issues. 
2) Some more progress towards getting analysis images working.
3) Fixed possible log corruption because of ssedetect().
 2012-02-01 07:33:21 +02:00
Kfir Itzhak b3a1dcf032 Fixed SSSE3 detection and changed few text strings. 2012-02-01 07:33:21 +02:00
Kfir Itzhak de015761c1 Fix different palettes warning showing up when using automatic palette selection. 2012-02-01 07:33:21 +02:00
Kfir Itzhak 41ad83a7d3 Added updated configure and src/zm_config_defines.h 2012-02-01 07:33:21 +02:00
Kfir Itzhak b51bce05e8 Rebased to SVN revision 3487 2012-02-01 07:33:21 +02: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 66f5d7c2f1 Added #defines to control the inclusion of the SSE code. 2012-02-01 07:33:21 +02:00
Kfir Itzhak 349e18b543 Few text corrections. 2012-02-01 07:33:21 +02:00
Kfir Itzhak ca57ae6438 1) Fixed and refinished the JPEG and MJPEG capture palettes support. 
2) Added the SSE2 alarmedpixels code, although its unused at the moment.
3) Small changes in libjpeg interaction.
4) Small other changes.
 2012-02-01 07:33:21 +02:00
Kfir Itzhak 7e0206bbcc Disable zm_event.cpp deleting the diagnostic images every second 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 46aa1bb1d8 Fixed bug in linked monitor loading code which should fix the crash of a monitor linked to a disabled monitor. 2012-02-01 07:33:20 +02:00
Kfir Itzhak 442b9e5ba2 1) Reloaded zm_event.cpp to hopefully fix its issues once and for all. 
2) Added backup code in case sendfile() fails.
3) Fixed a bug that allowed to link a monitor to itself, which can cause alarm lasting forever once triggered.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak bc255d1b06 1) Replaced the blend and delta algorithms with newer versions that use 1 less register and 1 less instruction per iteration. 
2) Fixed small bug in rgb_convert
 2012-02-01 07:33:20 +02:00
Kfir Itzhak de2df49d64 1) Added support for the new formats to the mpeg code. 
2) Fixed unwanted extra call to set video format for local cameras.
3) Small changes to the perl shared memory types.
 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 11029d57b6 Small code fixes 2012-02-01 07:33:20 +02:00
Kfir Itzhak eab09844de 1) Some more work on the overlay function. 
2) Got rid of some compiler warning messages.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 2fd6e99ec5 1) Rebased to 1.24.4 
2) Reverted to stock zmdc.pl.in and zmwatch.pl.in because the bugs are fixed
3) Updated configure and Makefile files
 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 1afe0bbf42 1) Added back the colour SSE2 delta algorithms 
2) Modified SSE algorithms to use one less register
3) Fixed AlarmedPixels motion detection
 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 ea3a1a9072 1) Removed the mmap file removal at shutdown. 
2) ZoneMinder should now compile cleanly wihout swscale
3) Fixed multiple monitors capturing from the same device and channel.
Current code allows for multiple monitors sharing the same device, each on a different channel
Or, multiple monitors sharing the same device, all on the same channel.
In both cases, capture method, width, height and palette must be identical on all monitors.
However, target colorspace can be different because each monitor handles the format conversion separately.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 37cc9199b2 1) Changed ZM static colours to RGB order instead of HTML(BGR) order 
2) Allow ZM to compile without swscale - hopefully
3) Saved few cpu cycles during image blending
4) Fixed wrong zone colours showing up
5) Unrelated fix: Allow ZM to be compiled with the latest ffmpeg revisions
 2012-02-01 07:33:20 +02:00
Kfir Itzhak f2aaeb78e0 1) Completed ffmpeg code 
2) Minor changes to zm_local_camera.cpp
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 33119c6dc5 1) Added image size requirements to ensure proper alignment 
2) Changed image class buffer related functions
3) Improved format selection for local cameras
4) Removed imagesize check for swscale
5) Fixed mmap unexpected memory size when changing capture options
6) Fixed unrelated bug in zmdc.pl: sockets directory doesn't exist
 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
Kfir Itzhak 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
Kfir Itzhak 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
stan 4e0d775e5b Added in additional headers to provide missing defines on some distros. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3514 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-09-08 15:39:58 +00:00
stan b64c506659 Added SFTP upload option. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-23 14:10:20 +00:00
stan 3aa6c13c64 Added auto reconnect option to database 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3499 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-23 13:31:04 +00:00
stan 7a08ab3c24 Added in some includes that are required on some systems. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3489 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-03 11:31:06 +00:00
stan 4891781523 Fixed issue with single image capture from cameras that don't provide content length 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3484 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-27 16:08:48 +00:00
stan 2c87c43978 Use dedicated DB connection for logging, with auto reconnect set up. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3474 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-28 11:07:35 +00:00
stan 02831ddcb1 Removed support for old locations of ffmpeg headers 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3468 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-24 16:05:06 +00:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan 154880ac15 Now detects camera restarts and disconnections properly. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3342 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-16 22:53:31 +00:00
stan b3b715e022 Fixes to work with latest ffmpeg 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3338 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-15 20:38:51 +00:00
stan a90ae4f19f Added additional info to exceptional polygon message 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3328 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-26 15:48:21 +00:00
stan 0ff4e53832 Allow FPS reporting to be disabled by setting valure to zero 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3308 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-03-02 12:23:10 +00:00
jaidhar e3f8bdb6cd XML (eyeZm) plugin: Now renamed plugin to eyeZm, along with all database variables. Note that this must still reside in the skins/xml path until iPhone apps can be moved over at a later point in time 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3306 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-19 20:25:54 +00:00
stan 278b78f012 Added missing V4L1 conditional 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3304 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-17 09:31:33 +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 beffdab035 Improved fast image blending somewhat and changed image class to use generic typedefs rather than libjpeg ones. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3301 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-15 11:18:41 +00:00
stan 39b5400046 Tidied up memory freeing a bit. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3297 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-11 17:54:45 +00:00
stan 1ef02ac35a Tidied up disposal of ffmpeg structures. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3296 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-11 17:51:08 +00:00
stan e91795a619 Removed netpbm options 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3295 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-11 14:50:04 +00:00
stan 162b1b2feb Fixed bug in signal checking - http://www.zoneminder.com/forums/viewtopic.php?t=17158 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3287 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 16:34:26 +00:00
stan f813ff1691 Cleaned up some deprecated ffmpeg calls. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3273 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 13:21:24 +00:00
stan d67d19dc4f Removed dependency on DB existing for config generation 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3245 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-21 23:53:36 +00:00
stan e11a5700c7 Removed -frepo line 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3244 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-21 23:53:07 +00:00
stan df0d6919c9 Added v4l2 interlacing control 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3230 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-20 18:49:42 +00:00
stan aa4a97d0da Fixed incorrect monitor type when loading individual ffmpeg monitors. Not used anywhere currently so no impact. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3225 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-17 18:18:46 +00:00
stan 46358c84e9 Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-07 11:10:18 +00:00
stan dc9e2755b0 Added sample apache config file. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-03 23:27:58 +00:00
stan 061a324a36 Fixed issue with image scaling etc when streaming. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3213 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-12-13 22:30:22 +00:00
jaidhar 069136fe53 Added vlog function to view log output, ability to redirect XML logging to it's own file 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3201 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:09:18 +00:00
jaidhar c7b3d04eed Got rid of MJPEG code choice for viewing events, only MPEG-4 and H264 now. Added default bitrate for event viewing to config XML 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3199 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:08:33 +00:00
jaidhar e57c1b0331 XML Plugin: More config options added, stability fixes to H264 streaming 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3192 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-12 23:04:09 +00:00
jaidhar 78caa0adb0 XML Plugin: Added more XML Options along with H264 options. These will be disabled unless client ver >=1.2. Added ability to track client version in PHP 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3191 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-12 04:26:31 +00:00
stan 46d777398e Updated to use fixed buffer sizes rather than relying on o/s defined. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3189 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-11 12:22:35 +00:00
stan ca4358bfd6 Initial libgcrypt to remove warning in zms and zmu 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3188 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-11 12:11:06 +00:00
jaidhar 2d7979ac93 XML Plugin: Moved key XML Plugin options to database and updated ConfigAdmin/options.php to show XML Tab (new category 'XML' created). More H264 streaming updates 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3186 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-11 05:25:43 +00:00
jaidhar 733eef46bd XML Plugin: Adding zmstreamer to application source 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3183 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-09 20:48:34 +00:00
stan 2effcc506b Reworked to handle signal lost events better and to prevent untimed events. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3172 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 16:43:33 +00:00
stan 3dccc2ee32 Regenerated 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3164 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 16:04:10 +00:00
stan 825eda95a6 Regenerated 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3162 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 15:56:23 +00:00
stan 257f975558 Commented out some unnecessary debug 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3156 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 10:03:58 +00:00
stan 9472311a38 Fixed some size_t compiler warnings. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3148 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-10-13 15:50:06 +00:00
stan 52b83eb813 Fixed issue with signal loss detection and timestamp label. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3143 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-10-08 22:42:54 +00:00
stan 36dddf22cc Updated to include standard type definitions. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3088 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-07-04 18:09:44 +00:00
stan b079f1e1c6 Updated to use standard types. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3087 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-07-04 18:00:35 +00:00
stan cd16c91ccd Tweaked zone image dumping. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3066 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-05-27 12:18:43 +00:00
stan 60f0136ed3 Merged in image root changes 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3040 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-28 19:16:40 +00:00
stan 2b375ef264 Changes to querying and probing. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3037 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-28 17:38:30 +00:00
stan 72416fc24b Now checks to see if user is in group as well as owner 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3036 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-28 17:38:13 +00:00
stan 5ae6123ba3 Updated deprecated ffmpeg functions. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3018 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-15 17:05:53 +00:00
stan 2c9eeef178 Updated JPEG memory functions to not conflict with new libjpeg8 functions. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3012 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-01-20 14:43:54 +00:00
stan f0e7aaf6db Made mapped memory files not hidden 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2999 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-12-02 18:37:24 +00:00
stan 77fb484226 Fixed some ssize_t format specifiers. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2996 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-12-02 01:29:11 +00:00
stan 00f7799685 Fixed some non-64 bit safe printf specifiers. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2995 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-11-24 11:45:36 +00:00
stan e9d3076785 Removed obsolete commented out line. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2994 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-11-24 11:45:00 +00:00
stan 075257be52 Added stdio.h for vsnprintf if not present 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2993 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-11-24 11:40:45 +00:00
stan e30ae4fa0e Only send http Keep-alive header for http 1.0 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2992 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-11-24 11:40:04 +00:00
stan 30c3c88c55 Remove MS_INVALIDATE from closing msync as not required. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2991 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-11-24 11:31:00 +00:00
stan a786dfeb66 Debug tidying and renaming. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2976 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-14 13:10:14 +00:00
stan 10b01a5062 Added Panic level for debug with stack dump. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2975 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-14 10:01:46 +00:00
stan 2066ad472b Fixied size_t format specifier for 64 bit systems 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2943 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-07-01 12:32:28 +00:00
stan 2c43bde47c Corrected some format specifiers to account for different size of size_t types on 64 bit systems 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2942 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-07-01 12:28:40 +00:00
stan 8cad0dbd6a Updated. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2933 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-24 10:27:28 +00:00
stan 174c82a452 Remove error message if terminated and can't send. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2916 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-09 14:15:02 +00:00
stan 11a1cc2d41 Now supports custom perl install path 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-08 09:11:56 +00:00
stan 5842ec5bfc Added detection for thread death. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2907 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-03 08:10:28 +00:00
stan c95ff6b6ba Added change running flag to started, and added running to just mean when thread func is going. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2906 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-03 08:10:02 +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 034f37cf4b Applied contributed patch. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2890 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-25 18:03:46 +00:00
stan ad77dc2e56 Applied patch to restore camera settings at startup. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2870 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-13 10:43:49 +00:00
stan a02eba25ff Minor mpeg format and config changes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2868 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-08 15:24:39 +00:00
stan 820dce5e42 Updated for decimal frame rates. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2867 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-08 13:47:19 +00:00
stan ca858a8562 Applied patch from 'mitch' to improve error detection when streaming. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2864 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-08 09:47:37 +00:00
stan 17386aa49f Changed case of session cookie header. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2850 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-04-14 20:20:02 +00:00
stan 4c8352153d Removed srand call and improved error message. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2849 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-04-14 20:19:36 +00:00
stan 18f196dbcd Added srand initialisation. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2848 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-04-14 20:18:57 +00:00
stan 72f908c4e7 Changed streaming to dynamically reduce frame rates if streams are sent too slowly. Made low bandwidth montage more resilient. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2844 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-04-03 12:10:54 +00:00
stan fa5db09a73 FIxed issues with negative FPS affecting streaming. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2839 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-04-01 19:39:23 +00:00
stan cf30933bb4 Conditional compilation for recent V4L2 addition 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2834 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-31 14:09:53 +00:00
stan afe253b71a Added V4L2 query 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2827 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-31 12:57:34 +00:00
stan 41c2889df2 Added query capabilities for V4L2 cameras 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2824 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-30 15:27:15 +00:00
stan e4d00ba189 RTSP fixes and tweaks 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2815 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-27 09:27:24 +00:00
stan 75c654e654 Downgraded to support autoconf 2.59 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2812 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-23 21:59:13 +00:00
stan 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
stan c65b50e312 Minor header sort out and libz no longer mandatory. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2809 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-20 12:39:29 +00:00
stan f29e7b7436 Commented out recent redundant pix_format definitions 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2808 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-20 11:33:05 +00:00
stan 3069dc2402 Final timestamp update 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2802 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-09 12:45:32 +00:00
stan 429884741a Updated for timestamps 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2801 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-09 12:32:04 +00:00
stan 73ad3a7097 Changed types/order of stream status structs to work on 64 bit systems. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2797 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-08 14:34:09 +00:00
stan b89b1cfc7c Fixed non-standard for webcam properly 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2785 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-20 18:15:16 +00:00
stan 61089eeeb1 Added authentication hashed logins. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2781 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-19 14:06:39 +00:00
stan ee972ac78a Fixed issue with event section lengths being ignored on alarm and rationalised debug. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2778 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-18 22:05:32 +00:00
stan 28692c1b28 Fixed greyscale issue and don't do format conversion if not required. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2777 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-18 12:30:43 +00:00
stan ff2ac65117 Improved confusing error message. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2776 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-18 12:30:17 +00:00