f5eedb2bfc
Merge pull request #302 from pjhacnau/master
...
Additional compile guards to allow compilation on non-x86 archs
2014-02-01 14:02:47 -08:00
af7a49d8d0
Change comments for many Camera subclasses so that comments match the subclass.
2014-01-27 16:52:46 -08:00
9a31bbb4d0
zm_signal.cpp needed extra compile guards too. Confirmed building on non-x86 (ia64 for convenience)
2014-01-23 16:09:42 +11:00
5786af0d4e
Added missing x86 compile guards to zm_image.cpp. This should allow ZoneMinder to at least build again on non-x86 architectures.
2014-01-23 14:49:46 +11:00
784f9d925c
Remove src/zm_config_defines.h from repository as its not needed, its generated by zmconfgen.pl and will cause conflicts when doing an out-of-source build
2014-01-12 13:27:59 +02:00
a74b22a5ed
Merge pull request #297 from ZoneMinder/curl
...
Add cURL source type
2014-01-11 06:04:03 -08:00
3ded7276e1
Attempt to fix zmu "Error, failed to enumerate standard X: Success"
...
http://www.zoneminder.com/forums/viewtopic.php?f=30&t=21803
2014-01-10 13:40:52 +02:00
936198de85
Fix typo
2014-01-10 09:27:55 +02:00
b2a65dc343
cURL minor corrections and improvements
2014-01-10 09:17:12 +02:00
21f7ec12eb
Added useful string functions that will be used later on for rtsp digest authentication
2014-01-08 15:57:17 +02:00
9901ce9e84
Merge remote branch 'origin/master' into curl
2014-01-05 10:16:01 +02:00
e202cdb6d0
Fixed digest authentication and minor changes
2014-01-05 10:15:28 +02:00
f39667c0cd
Fix ZM not compiling with ZM_NO_FFMPEG=ON since #259 , closes #285
2014-01-01 18:19:42 +02:00
0ff77d835b
Improved error handling and other minor changes
2013-12-31 15:50:06 +02:00
ff9a26273c
cURL is now working!
2013-12-27 18:02:32 +02:00
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
89cfb96855
Merge pull request #277 from ebarnard/libvlc
...
Add libVLC source type
2013-12-22 13:01:19 -08:00
e9bb632a78
Remove zmfix
2013-12-22 16:08:17 +02:00
40b0f5d091
Merge pull request #1 from ZoneMinder/libvlc-improvements
...
Add header file checks for vlc/vlc.h
2013-12-21 17:07:57 -08:00
6c94308ba0
Fix bug in frame difference checker.
2013-12-22 01:06:12 +00:00
dce1cbf0ce
Add header file checks for vlc/vlc.h
2013-12-21 06:47:12 +02:00
aa6380c4bd
Might now build with autotools.
2013-12-19 23:15:16 +00:00
3e2647782d
Better error handling
2013-12-19 23:10:45 +00:00
f4d72752a8
Check for frame differences as libvlc provides frames at a constant 15fps even if they are duplicates
2013-12-19 23:02:21 +00:00
e4a16ee57c
All colourspaces now working
2013-12-19 21:51:39 +00:00
c25011e781
Fix seemingly random lockup.
2013-12-19 21:51:39 +00:00
3321506b45
Working libvlc camera implementation.
2013-12-19 21:51:39 +00:00
48a6dcf5ce
Change COnfig from using the subroutine symbol table to just using a global hash
2013-12-16 16:32:02 -05:00
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
45ad839f96
Merge pull request #259 from ebarnard/rtsp-fix
...
Regression: Fix RTSP decoding errors in 1.26.4 fixes #221
2013-12-13 10:12:50 -08:00
e9f4479171
Added support for UYVY capture palette (required for some Bluecherry cards)
2013-12-10 15:13:48 +02:00
c630174868
Adds support for h264 cameras that fail to set m bit for end of fragmented frames.
2013-12-07 11:21:10 +00:00
9a06ec51c6
Save a couple of cpu cycles.
2013-12-02 15:37:26 +00:00
5d9dcba2d8
Adds support more H264 NAL types and tidies function
2013-11-30 22:00:52 +00:00
21946b5854
H264 SPS and PPS frames are now handled correctly
2013-11-30 21:59:04 +00:00
80d172efa1
The last packet of a fragmented mpeg4 frame is no longer rejected.
2013-11-29 16:15:56 +00:00
3665c3ee3a
Fixed bug in mpeg4 depacketizer and RTCP implementation.
2013-11-28 23:07:46 +00:00
560d9bd809
RtpSource can now distinguish between payload types and handles some properly.
2013-11-28 21:32:06 +00:00
d50169c383
Added SWScale wrapper class and FFMPEG PixelFormat match function
2013-11-26 16:34:26 +02:00
88f2bc6b63
Fix zmc crashing on shutdown (for remote http cameras) caused by content_length sign mess
2013-11-24 15:37:47 +02:00
eff58367b4
IPv6 improvements
2013-11-22 15:30:05 +02:00
6a23a051c6
Merge pull request #252 from guotie/master
...
ipv6 support to http remote camera code
2013-11-19 06:27:20 -08:00
bed30d32b6
Remove round() mess
2013-11-15 11:41:26 +02:00
fe829e7a4b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2013-11-06 16:58:23 -05:00
891757da74
Merge pull request #232 from josephevans/master
...
Cast content_length to signed int for error-check comparison
2013-11-04 11:59:44 -08:00
f6bf3743f7
very sub-optimisation, removing duplicate comparisons
2013-11-04 10:50:40 -05:00
c1970a51e3
Fix few errors and syntax errors regarding curl
2013-11-04 17:10:07 +02:00
8e96df7643
Initial work on adding cURL to zoneminder
2013-11-04 16:52:21 +02:00
4e1d23669f
Revert content_length to be int
2013-11-04 10:54:39 +02:00
408cac5120
Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now)
2013-11-04 09:11:33 +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
b368d306b9
Fix marker-out-of-bounds crash when defining zone points
2013-11-02 15:56:42 -07:00
550040474f
Cast content_length to signed int for error-check comparison, preventing segfault when attempting to read buffer.
2013-11-01 14:11:48 -07:00
3c59961846
Merge branch 'cmake-outofsource'
2013-11-01 14:01:42 +02:00
21ae767aa7
Merge branch 'rotatefix'
2013-11-01 13:34:21 +02:00
069552321f
Fix zmc crashing when four field deinterlacing is enabled together with left or right rotation
2013-11-01 13:31:37 +02:00
c2bd7c97ec
First attempt at enabling out-of-source building for zm with cmake
2013-10-31 18:10:00 +02:00
36d94d160f
Change zm_monitor.h mem_size from long to unsigned long. Fixes #226 .
2013-10-30 09:18:13 -04:00
2c04690865
Allow larger shared memory sizes. Fixes #226
2013-10-30 08:39:24 -04:00
79c7a1b255
Apply INSERTs in Event::AddFrames in batches to avoid excessive query length
2013-10-26 18:41:12 -07:00
17f2736860
Merge pull request #218 from ZoneMinder/ffmpegfixes
...
ffmpeg detection improvements
2013-10-19 13:06:03 -07:00
557c0a3d30
Update zm_remote_camera_http.cpp
2013-10-11 14:31:37 +08:00
042e50eecc
Update zm_remote_camera_http.cpp
2013-10-11 14:28:43 +08:00
e0728f7dc1
Update zm_remote_camera.cpp
2013-10-11 14:26:48 +08:00
e35c541715
Update zm_remote_camera.h
2013-10-11 14:24:23 +08:00
421d67e379
Improvements to zm_ffmpeg.h
2013-10-10 07:16:11 +03:00
8cecadadc2
Fix rotation bug caused by commit 5a9364703c
2013-10-10 06:55:45 +03:00
79af2adaa0
When loading a new event, always set the current frame id to the first frame rather than the last
2013-10-09 07:32:27 -05:00
70fb31c2e3
Changed debug levels to 4-6
2013-10-07 14:40:38 -05:00
32bd588a1c
Change frameserver warnings to debug level 2
2013-10-07 13:57:14 -05:00
25297bde73
Push the debugging in zm_signal further down
2013-10-07 11:27:53 +03:00
2cb65c6430
Always print cr2 and ip as long if siginfo and ucontext are available
2013-10-07 11:07:41 +03:00
1d7f664627
1) Removed the use of deprecated and undocumented sigcontext (Replaced by siginfo and ucontext)
...
2) Removed the checks for sigcontext, strsignal and siginfo.h
3) Added debugging code to the die handler
4) Using SA_RESTART in the hup and reload handlers to prevent certain functions returning EINTR
5) Added SIGINT and SIGQUIT to the term handler
2013-10-07 10:37:58 +03:00
e4b1be73ef
Used indent -linux on src/zm_signal.cpp to convert all spaces to tabs
2013-10-07 02:57:01 +03:00
cd154e86f2
Remove accidently committed planned crash code in src/zmc.cpp
2013-10-07 02:44:56 +03:00
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
b5c536b134
Signal and backtrace improvements
2013-10-06 18:26:33 +03:00
a9e886aea2
Fix small zipped images bug introduced by commit e12a9dc408
2013-10-06 06:35:56 +03:00
96902c216d
Fix comparison sign warning introduced in pull request #174 commit 33b6e5c
2013-10-05 16:42:13 +03:00
e12a9dc408
Fixed compilation failure when zlib is not available
2013-10-04 23:20:39 +03:00
34f84a4097
Merge branch 'v1.26.4-beta'
2013-10-03 10:14:09 -04:00
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
b0a014928e
remove #else errors for avutils/ffmpeg
2013-10-01 16:05:49 +04:00
48f11a8064
Add cmake to zoneminder
2013-09-28 12:59:50 +03:00
25ff325118
Comment missed in determining stream header.
...
Property 'title' and 'comment' not supported.
2013-09-27 16:51:33 +04:00
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
dddec742e0
Fixed zm_logger not including zm_config.h first.
2013-09-25 09:00:52 +03:00
e8d20faec8
Proper checking for sys/syscall.h
2013-09-25 07:11:59 +03:00
f2225f23cd
Update zm_thread.h
...
As proposed on https://github.com/ZoneMinder/ZoneMinder/issues/170
2013-09-24 17:07:36 -03:00
aeed1d4043
Update zm_timer.h
...
As proposed on https://github.com/ZoneMinder/ZoneMinder/issues/170
2013-09-24 17:03:36 -03:00
aef9ab2f00
Removed NumCoords entirely from zm_zone.cpp
2013-09-24 07:41:37 +03:00
ac7f7f08a7
Fix some compilation warnings
2013-09-24 07:31:02 +03:00
c526fcedd7
Fix an issue created by commit 2b568906e5: Log flooded with image dimensions differ errors
2013-09-24 07:15:37 +03:00
b08a8252c4
Merge branch 'dukess-master' into v1.26.4-beta
...
Conflicts:
scripts/zmupdate.pl.in
2013-09-18 13:03:54 -04:00
5a9364703c
a better fix for the sign comparison warnings during compilation
2013-09-17 10:28:59 +03:00
c3f7af7cd1
Fix sign warning during compilation
2013-09-15 04:13:09 +03:00
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
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
0a9e63ca2c
remove autogenerated files
2013-09-06 14:40:55 -04:00
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
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
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
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
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
860c331d58
Suppresses erroneous Corrupt Jpeg messages sent from the jpeg library
2013-08-18 15:01:46 -05:00
31daa32194
Added frameserver patch from Zoneminder Wiki
2013-08-18 13:28:55 -05:00
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
ee251b3c02
Removing lingering references to UsedPl
2013-08-13 12:34:59 -04:00
0ec6622a9e
Cleaning up some build errors regarding Native Motion Detection
2013-08-13 09:59:30 -04:00
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
1888bec092
Doing my best to manually remove nextime's plugin architecture while keeping his other changes.
2013-08-13 09:43:23 -04:00
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
3a8481a591
cleanup
2013-05-10 14:02:22 -04:00
9d89fb3bcb
Merge branch 'kfir-proper' into develop
2013-05-10 12:23:58 -04:00
7cf5475542
Merge ../ZoneMinder-kfir into kfir-proper
...
Conflicts:
configure
src/Makefile.am
src/Makefile.in
2013-05-02 21:28:51 -04:00
044af38cdb
match up #if's regarding gnutls-openssl
2013-04-29 16:44:37 -04:00
ce61512a0d
gnutls changes from ubuntu package
2013-04-29 15:32:55 -04:00
36f25c7ffb
add -fno-inline from ubuntu package
2013-04-29 15:31:55 -04:00
1c3f6a9637
fix typos
2013-04-29 13:45:27 -04:00
0967797933
add unistd.h to fix compile
2013-04-29 13:44:21 -04:00
6db183a5ba
add mathetmatics.h to fix compile
2013-04-29 13:43:48 -04:00
bd5e2da5c7
fix for kernel3.5
2013-04-29 13:29:51 -04:00
84370b7fd8
add unistd.h include to fix compile
2013-04-29 12:51:46 -04:00
8bf1824159
Ok, this time it will work?
2013-04-27 02:17:11 +02:00
7cb43d0efc
Fix a wrong macro..
2013-04-27 01:10:51 +02:00
6af58aca09
Fix CodecID changes in recent libav libraries
2013-04-27 00:59:34 +02:00
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
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
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
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
a6c7acd02a
Some more progress on the deinterlacing code.
2012-07-13 20:11:16 +03:00
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
8f0ec42ba2
First work on adding built-in deinterlacing to ZM.
2012-07-13 20:11:16 +03:00
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
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
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
e413042cdb
Fixed a longtime bug in my version that caused distorted analysis images in some setups.
2012-04-01 13:03:18 +03:00
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
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
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
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
8d304972f1
Fix compile error caused by the previous commit.
2012-02-09 13:10:48 +02:00
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
1f072b1a62
Fixed few zma issues related to signal checking and linked monitors.
2012-02-01 07:33:21 +02:00
2135e58c41
Fixed zma crashes caused by flaky signal and few bugs in mocord mode.
2012-02-01 07:33:21 +02:00
fc1807f433
Fixed possible small stack corruption.
2012-02-01 07:33:21 +02:00
8e9ccfe1ec
Removed the now unused SSE2 AlarmedPixels code.
2012-02-01 07:33:21 +02:00
d7e9c6ad5c
Analysis image finally working!
2012-02-01 07:33:21 +02:00
af821828b8
Changed a few warnings
2012-02-01 07:33:21 +02:00
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
Andrew Bauer
Kevin Dalley
Peter Howard
Peter Howard
Kfir Itzhak
Ed Barnard
Edward Barnard
Isaac Connor
Kyle Johnson
David Nesting
Joe Evans
Kyle Johnson
guotie
Andrew Bauer
Isaac Connor
POKKAHOH
Raul Almeida
Isaac Connor
Andrew Bauer
nextime
stan