7de59df080
removed use of av_err2str. someone could not compile when using that macro.
2014-10-12 16:23:58 +11:00
a307b8a1e3
Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file.
2014-10-12 16:23:58 +11:00
ebf466c2df
- Timeout when opening stream after 10 seconds
...
Sometimes when restarting the camera ffmpeg hung itself in some state, when calling avformat_open_input, which seemed to last forever.
- Reopen stream if av_read_frame returns EOF
Sometimes ffmpeg starts returning an EOF error when calling av_read_frame. Once this happens it seems no more images will ever be captured.
- Reopen stream if av_read_frame returns -110
Means something like Connection failed; cant remember. Anyway. Once this happens it seems no more images will ever be captured.
2014-10-12 16:23:58 +11:00
0bb2d9f81d
Merge pull request #407 from m-bene/rtspDigest
...
Rtsp digest
2014-10-11 17:39:57 -05:00
9ef9b17c6b
fixes ftbs with no ffmpeg support
2014-10-11 17:14:09 -05:00
549360cabd
Merge branch 'zms/videostream-improvements' of https://github.com/Sune1337/ZoneMinder into Sune1337-zms/videostream-improvements
...
Conflicts:
src/zm_ffmpeg.h
src/zm_mpeg.cpp
2014-10-11 15:38:38 -05:00
c9e04e48bb
Am remarking out some Debugs that would only be useful to someone debugging image code. Of no use to end users and get called so much that must cause a performance problem, especially when debug logging is actually turned on
2014-09-18 15:44:53 -04:00
1076a621c8
fix crashes
2014-09-08 16:56:40 -04:00
8891639767
fix another segfault
2014-09-08 16:46:41 -04:00
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
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
83870b911d
debugging in progress but builds
2014-08-21 11:53:14 -04:00
5a7c989ccd
remove some crap that I pushed
2014-08-21 11:52:35 -04:00
c6d19b3ecf
whitespace issue
2014-08-21 11:14:38 -04:00
3d8ad2c906
fall back to Config table setting for v4l MultiBUgger and captures per frame.
2014-08-21 09:59:08 -04:00
92d110859d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-08-19 09:12:45 -04:00
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
6d92299d46
Merge pull request #440 from kylejohnson/master
...
Cleaning up the Contribution section of the README
2014-08-12 11:13:46 -04:00
cca01dc357
connect to the monitor, because instantiating the object no longer does that
2014-07-30 14:20:48 -04:00
2087780ec1
tweaks to make debian build with support for mariadb, update version and start using a fourth version digit set
2014-07-29 14:43:13 -04:00
7147d47a76
Improve error messages when empty mmap file to reduce FAQ
2014-07-29 09:45:19 -04:00
585a1c50a1
Merge branch 'nommap'
2014-07-24 14:40:37 -04:00
edd794a993
ensure captures_per_frame >0
...
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-07-14 14:07:28 -04:00
4f694ee8cf
fix
2014-07-14 13:07:23 -04:00
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
9385471392
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-07-13 16:39:27 -04:00
9163536219
Merge pull request #358 from knnniggett/prevbutton
...
Fix prev button while in gapless mode. All buttons tested and working.
2014-07-04 10:33:05 -05:00
6e22278f74
password might be null when auth_relay is none.
2014-06-27 12:47:56 -04:00
07dbbd46d3
only do mmap on demand
2014-06-26 14:54:47 -04:00
8f4fb8bb64
fix mysql_escape_String call. Must use strlen, not sizeof
2014-06-26 14:44:37 -04:00
20bccdf431
use the size of the username and password when calling mysql_escape_string
2014-06-25 16:23:10 -04:00
0592276f53
fix mysql_escape_string calls after referring to docs
2014-06-24 11:22:08 -04:00
229cfcaa5b
Find the last occurrence of '@' in the host string. Fixes #443
2014-06-23 14:22:27 -04:00
a9cd6caeaf
Minor corrections to cURL code
2014-06-06 09:35:02 +03:00
93aed26a00
escape username and password inside zm_user
...
by rogerroger288
2014-06-05 15:18:02 -04:00
5fea101294
Merge pull request #421 from m-bene/ffmpegoptions
...
Add optional options field for ffmpeg and VLC source types
2014-05-18 18:07:42 +03:00
a81b9b8ce2
change examples for options
2014-05-17 21:48:08 +02:00
f62afdb8cc
add select list for rtsp method for ffmpeg and libvlc
2014-05-17 20:41:22 +02:00
9a71a0068a
add help window for ffmpeg/libvlc options
2014-05-17 04:33:33 +02:00
1b4f9c082c
change check for av_dict_set success
2014-05-15 16:01:29 +02:00
6016206f98
modify debug message
2014-05-15 15:42:27 +02:00
5cb7cd916f
add quotes to option debug/warn messages
2014-05-15 15:13:39 +02:00
c1557a99e5
add debug and warn messages
2014-05-15 15:06:01 +02:00
00aad4a128
frame_count should be an integer so don't use NULL
2014-05-05 13:06:58 -04:00
8333e909ed
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-05-05 11:29:55 -04:00
a8929914bb
add a NULL test for frame_coutn before calling atoi.
2014-05-05 11:29:09 -04:00
ae0ee9b3b3
testing/fixing
2014-05-05 15:54:13 +02:00
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
4de46c7988
Fix wrong values used for type boolean
2014-05-05 09:26:32 +03:00
e916ce22d9
Update zm_jpeg.cpp
...
Change 0 to FALSE in order to avoid compiling error on Debian Wheezy:
[ 31%] Building CXX object src/CMakeFiles/zm.dir/zm_image.cpp.o
/opt/ZoneMinder/src/zm_image.cpp: In member function ‘bool Image::WriteJpeg(const char*, int) const’:
/opt/ZoneMinder/src/zm_image.cpp:863:42: error: cannot convert ‘bool’ to ‘boolean’ for argument ‘3’ to ‘void jpeg_set_quality(j_compress_ptr, int, boolean)’
/opt/ZoneMinder/src/zm_image.cpp: In member function ‘bool Image::EncodeJpeg(JOCTET*, int*, int) const’:
/opt/ZoneMinder/src/zm_image.cpp:1096:42: error: cannot convert ‘bool’ to ‘boolean’ for argument ‘3’ to ‘void jpeg_set_quality(j_compress_ptr, int, boolean)’
make[2]: *** [src/CMakeFiles/zm.dir/zm_image.cpp.o] Error 1
make[1]: *** [src/CMakeFiles/zm.dir/all] Error 2
make: *** [all] Error 2
2014-05-04 02:35:17 +02:00
20528e610f
fix digest auth for RTSP using HTTP tunnel
2014-04-30 15:33:29 +02:00
e25420efaa
add digest auth file for cmake
2014-04-29 17:31:06 +02:00
2ccd3492bf
parse 401 response for RTP_RTSP_HTTP
2014-04-29 00:42:38 +02:00
3595777d79
add RTSP digest authentication
2014-04-28 23:37:31 +02:00
48b361b1eb
- Arrays should be deleted using "delete[]" and not "delete"
2014-04-28 17:20:37 +02:00
a4f597696a
- render video using double buffers
...
this is to deliver frames more accurately to the client
2014-04-26 18:25:48 +02:00
448d287240
- use _AVCODECID_NONE instead of CODEC_ID_NONE
2014-04-25 23:22:53 +02:00
3155d621d0
- Removed an unreferenced variable
...
- fixed compilation issue with sws_..isSupported when compiling with ffmpeg 0.5
2014-04-25 22:57:29 +02:00
4767326484
A variable was referenced as a pointer when it was not.
2014-04-25 22:27:56 +02:00
04b8ecf0a7
Support streaming with zms (using ffmpeg) better
...
* ZoneMinder compiles with ffmpeg 0.5..master
* Make VideoStream class able to stream through ffmpeg better.
* Ability to use fixed quality instead of fixed bitrate (by specifying bitrate 0...100)
* Format url parameter supports <format>/<encoder> syntax
Details:
- Redefine av_err2str to a to avoid compiler warning on newer g++'s
- When using rtp format; if ffmpeg does not have a default codec, use CODEC_ID_MPEG4. (because this is what the default is as of 2.2 when this code was written)
- Specify ofc->packet_size if rtp format is requested
- Video generated in a thread to guarantee a constant fps.
- Move _AVCODECID definition into zm_ffmpeg.h (and use instead of (AV)CodecID
- Call avformat_network_init because ffmpeg warns about it beeing required soon.
- increase VideoStream::video_outbuf_size to 4MiB to be able to encode larger pictures
2014-04-25 22:12:58 +02:00
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
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
0dbcc836b4
Merge pull request #325 from elenril/master
...
Support building with new libavcodec versions.
2014-04-19 00:08:39 +03:00
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
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
35468af815
Merge pull request #338 from m-bene/extendPreclusive
...
add feature to extend preclusive zone alarm state by x frames
2014-04-08 08:04:37 -05:00
b126ca3e01
modify play button
2014-03-30 11:18:14 -05:00
3f7f398210
rework prev and next buttons
2014-03-28 17:18:34 -05:00
d60b4a2eee
Merge pull request #352 from m-bene/CurlHeaderCase
...
make curl header check case insensitive
2014-03-25 17:23:56 -05:00
264b98548f
Fix prev button while in gapless mode. All buttons tested and working.
2014-03-25 17:12:26 -05:00
d2be7d4cd8
Update zm_event.cpp
...
Commit 79af2adaa0
2014-03-25 07:01:40 -05:00
32941cfef7
make curl header check case insensitive
2014-03-23 07:06:54 +01:00
2784b3d1f5
Merge master
2014-03-20 10:26:12 +01:00
69f6af93d1
Patch for Debian bug 736516 - FTBFS on powerpc arch.
2014-03-16 10:51:54 -05:00
11fde73be1
This fixes a compile issue on i386 plaforms with the PIC compiler flag set
2014-03-15 11:38:10 -05:00
26777487dc
add feature to extend preclusive zone alarm state by x frames
2014-03-09 17:05:39 +01:00
296aa2517b
Support building with new libavcodec versions.
...
CODEC_ID_* has been replaced with AV_CODEC_ID_* upstream.
2014-02-06 08:39:47 +01:00
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
Sune1337
Andrew Bauer
Andrew Bauer
Isaac Connor
Kyle Johnson
root
Kyle Johnson
Kfir Itzhak
m-bene
aztazt
Sune1337
Anton Khirnov
Kevin Dalley
Peter Howard
Peter Howard
Ed Barnard
Edward Barnard
David Nesting
Joe Evans
guotie