Commit Graph

806 Commits

Author SHA1 Message Date
Kfir Itzhak d50169c383 Added SWScale wrapper class and FFMPEG PixelFormat match function 2013-11-26 16:34:26 +02:00
Kfir Itzhak 88f2bc6b63 Fix zmc crashing on shutdown (for remote http cameras) caused by content_length sign mess 2013-11-24 15:37:47 +02:00
Kfir Itzhak eff58367b4 IPv6 improvements 2013-11-22 15:30:05 +02:00
Kfir Itzhak 6a23a051c6 Merge pull request #252 from guotie/master
ipv6 support to http remote camera code
2013-11-19 06:27:20 -08:00
Kfir Itzhak bed30d32b6 Remove round() mess 2013-11-15 11:41:26 +02:00
Isaac Connor fe829e7a4b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-11-06 16:58:23 -05:00
Kfir Itzhak 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
Isaac Connor f6bf3743f7 very sub-optimisation, removing duplicate comparisons 2013-11-04 10:50:40 -05:00
Kfir Itzhak 4e1d23669f Revert content_length to be int 2013-11-04 10:54:39 +02:00
David Nesting b368d306b9 Fix marker-out-of-bounds crash when defining zone points 2013-11-02 15:56:42 -07:00
Joe Evans 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
Kfir Itzhak 3c59961846 Merge branch 'cmake-outofsource' 2013-11-01 14:01:42 +02:00
Kfir Itzhak 21ae767aa7 Merge branch 'rotatefix' 2013-11-01 13:34:21 +02:00
Kfir Itzhak 069552321f Fix zmc crashing when four field deinterlacing is enabled together with left or right rotation 2013-11-01 13:31:37 +02:00
Kfir Itzhak c2bd7c97ec First attempt at enabling out-of-source building for zm with cmake 2013-10-31 18:10:00 +02:00
Kyle Johnson 36d94d160f Change zm_monitor.h mem_size from long to unsigned long. Fixes #226. 2013-10-30 09:18:13 -04:00
Kyle Johnson 2c04690865 Allow larger shared memory sizes. Fixes #226 2013-10-30 08:39:24 -04:00
David Nesting 79c7a1b255 Apply INSERTs in Event::AddFrames in batches to avoid excessive query length 2013-10-26 18:41:12 -07:00
Kfir Itzhak 17f2736860 Merge pull request #218 from ZoneMinder/ffmpegfixes
ffmpeg detection improvements
2013-10-19 13:06:03 -07:00
guotie 557c0a3d30 Update zm_remote_camera_http.cpp 2013-10-11 14:31:37 +08:00
guotie 042e50eecc Update zm_remote_camera_http.cpp 2013-10-11 14:28:43 +08:00
guotie e0728f7dc1 Update zm_remote_camera.cpp 2013-10-11 14:26:48 +08:00
guotie e35c541715 Update zm_remote_camera.h 2013-10-11 14:24:23 +08:00
Kfir Itzhak 421d67e379 Improvements to zm_ffmpeg.h 2013-10-10 07:16:11 +03:00
Kfir Itzhak 8cecadadc2 Fix rotation bug caused by commit 5a9364703c 2013-10-10 06:55:45 +03:00
Andrew Bauer 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
Andrew Bauer 70fb31c2e3 Changed debug levels to 4-6 2013-10-07 14:40:38 -05:00
Andrew Bauer 32bd588a1c Change frameserver warnings to debug level 2 2013-10-07 13:57:14 -05:00
Kfir Itzhak 25297bde73 Push the debugging in zm_signal further down 2013-10-07 11:27:53 +03:00
Kfir Itzhak 2cb65c6430 Always print cr2 and ip as long if siginfo and ucontext are available 2013-10-07 11:07:41 +03:00
Kfir Itzhak 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
Kfir Itzhak e4b1be73ef Used indent -linux on src/zm_signal.cpp to convert all spaces to tabs 2013-10-07 02:57:01 +03:00
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