Emmanuel Papin
7fc359e940
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support
2015-01-03 13:46:41 +01:00
Isaac Connor
e02da8833a
ifdef's for BSD
2015-01-02 17:08:51 -05:00
Isaac Connor
92e6d940bc
ifdef's for BSD and cleanup
2015-01-02 17:07:49 -05:00
Isaac Connor
1137c3907e
ifdef's for BSD
2015-01-02 17:06:16 -05:00
Isaac Connor
e460c6f448
BSD uses some different includes, these are from FreeBSD ports
2015-01-01 17:18:12 -05:00
Emmanuel Papin
8619ed1322
Only load plugins when it is necessary
2015-01-01 22:33:03 +01:00
Emmanuel Papin
fe0476f36b
Revert commit 123326c299
2014-12-21 21:20:36 +01:00
Emmanuel Papin
d9bcf3aeef
Fix bad declaration in zm_detector.h
2014-12-21 20:54:42 +01:00
Emmanuel Papin
d961831355
Fix conflict when merging upstream master
2014-12-13 19:54:54 +01:00
Andrew Bauer
62b75808b3
Output to stderror when zmu can't read zm.conf
2014-12-10 17:54:09 -06:00
Isaac Connor
48f4d7eb93
Merge branch 'master' into BSD_device
2014-12-08 16:53:39 -05:00
Andrew Bauer
97ee989a94
Parse multiple streams in RTP-Info
2014-12-02 19:33:05 -06:00
Andrew Bauer
a6a779978a
move seq and rtpTime declarations outside conditional
2014-12-01 17:21:49 -06:00
Andrew Bauer
0099b54248
Make lack of RTP-Info non-fatal
2014-12-01 17:15:08 -06:00
Andrew Bauer
4a248cc3aa
add rtsp mediatype of application
2014-12-01 17:05:10 -06:00
Andrew Bauer
32e818e860
Check for RTSP timeout in PLAY command response
2014-12-01 16:58:42 -06:00
Emmanuel Papin
9e39924095
Fix confict when pulling master
2014-11-29 19:11:22 +01:00
Isaac Connor
02cdc37e3c
Merge pull request #607 from manupap1/memory_fix_leaks
...
Fix some memory leaks in zma
2014-11-29 10:18:17 -05:00
Isaac Connor
51aa4e67ea
Merge pull request #608 from knnniggett/RTSP_mUrl
...
echo the URL to the RTSP device during the OPTIONS directive
2014-11-29 10:14:26 -05:00
Andrew Bauer
e4fa475d87
Merge pull request #588 from ZoneMinder/digest_auth
...
Digest auth
2014-11-29 08:32:08 -06:00
Andrew Bauer
1cff253dde
echo the URL to the RTSP device during the OPTIONS directive
2014-11-29 08:13:06 -06:00
Emmanuel Papin
346015f472
Fix some indentations in zm_monitor.h
2014-11-29 14:39:57 +01:00
Emmanuel Papin
c313e2e389
Fix a memory leak in Monitor::Analyse()
2014-11-29 06:06:10 +01:00
Emmanuel Papin
73b25a1de0
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_mismatches
2014-11-29 03:39:05 +01:00
Emmanuel Papin
41edb4d958
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_leaks
2014-11-29 03:38:45 +01:00
Emmanuel Papin
a4c01435d7
Fix confict when pulling master
2014-11-29 03:37:06 +01:00
Isaac Connor
e6d47781d3
add Digest Authentication handling for simple http method.
2014-11-28 15:56:58 -05:00
Isaac Connor
87c741b165
Merge pull request #574 from manupap1/rtsp_fix
...
Fix memory leaks with rtsp and a bug
2014-11-26 15:13:39 -05:00
Isaac Connor
51703f5c37
Merge pull request #575 from manupap1/memory_fix
...
Close logger and database on exit
2014-11-26 15:08:21 -05:00
Isaac Connor
00287ab5dd
more debug output when buffer is undersized.
2014-11-25 14:51:20 -05:00
Emmanuel Papin
dde1e13f22
Merge branch 'master' into plugin_support
2014-11-21 14:02:12 +01:00
Isaac Connor
9eda71570a
merge the rest of my Digest-AUth fixes: This should solve #399
2014-11-20 10:44:31 -05:00
Isaac Connor
0b5a0df7dc
implement http_Digest Auth, and improve it for rtsp
...
Conflicts:
src/zm_remote_camera_http.cpp
src/zm_rtsp.cpp
2014-11-20 10:33:58 -05:00
Emmanuel Papin
81f4c2aa10
Revert memory leak patch in Monitor class (break analysis)
2014-11-20 00:33:22 +01:00
Isaac Connor
790005c155
Include monitor name in log otput so we know which monitor we are talking about. This informaton is not included when the error occurs in zms.
2014-11-19 12:42:05 -05:00
Emmanuel Papin
06e31f807f
Do not display the note when updating event (size may exceed buffer capacity)
2014-11-19 11:13:25 +01:00
Emmanuel Papin
166b4586aa
Fix an issue when updating the reference image
2014-11-19 10:50:41 +01:00
Emmanuel Papin
fab48b904f
Add some debugging information for reference images
2014-11-19 10:40:16 +01:00
Emmanuel Papin
123326c299
Standardize calls to image pointer
2014-11-19 10:18:11 +01:00
Emmanuel Papin
ef452cb986
Fix event logging to database
2014-11-17 17:32:55 +01:00
Emmanuel Papin
a03b3ce4e0
Increase buffer size for sql events
2014-11-17 00:21:03 +01:00
Emmanuel Papin
ecd9ab95eb
Fix error messages when loading plugins
2014-11-16 21:50:39 +01:00
Emmanuel Papin
e7f1c8b5d8
Fix logging issue with plugins
2014-11-16 20:46:24 +01:00
Emmanuel Papin
3d9a0f4729
Fix memory leaks in zmLoadConfig
2014-11-15 13:32:43 +01:00
manupap1
b2d3daaa65
Fix a mismatch free in zmc binary
2014-11-15 13:10:19 +01:00
manupap1
9eee62c6d2
Fix memory leaks in Image class
2014-11-15 12:58:08 +01:00
manupap1
658b9abea9
Fix memory leaks in Monitor class
2014-11-15 12:57:10 +01:00
manupap1
d2e849104c
Fix memory leaks with rtsp and a bug
2014-11-14 22:31:03 +01:00
manupap1
a1aaeb7905
Merge branch 'master' into memory_fix
2014-11-14 22:24:33 +01:00
manupap1
b4732e4750
Close logger and database on exit
2014-11-14 22:17:44 +01:00
manupap1
f05699a005
Fix a bug when closing RTSP session over TCP
2014-11-14 11:17:27 +01:00
manupap1
dac1756d0d
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
2014-11-14 10:55:05 +01:00
Andrew Bauer
3a9f814303
Merge pull request #572 from ZoneMinder/buffer_cleanup
...
remove the case for level >= 2. Since level is a bool, this code can ne...
2014-11-13 15:47:37 -06:00
Andrew Bauer
a00f719f12
Merge pull request #531 from SteveGilvarry/ffmpeg-stability-fixes
...
351-Rebase Attempt for ffmpeg stability fixes
2014-11-13 15:18:13 -06:00
Isaac Connor
9016e30f92
BSD uses /dev/bktr0 instead of /dev/video. This is actually pulled FreeBSD ports.
2014-11-13 14:47:07 -05:00
Isaac Connor
72f34203a0
remove the case for level >= 2. Since level is a bool, this code can never execute. Also, there are no calls to tidy in the current code with values other than 0 or 1, so it's safe to do. Also it removes an error message when using clang++
2014-11-13 14:41:49 -05:00
manupap1
2a3068cfa7
Add an option to display the status of plugins in zmu
2014-11-12 00:11:41 +01:00
manupap1
2033918b24
Add a pkg-config file
2014-11-11 23:53:09 +01:00
manupap1
003fafbf7d
Build a convenience library for plugin development
2014-11-11 23:28:12 +01:00
manupap1
731fa96fdf
Load plugins in Monitor class
2014-11-11 23:06:50 +01:00
manupap1
2796995d29
Update ImageAnalyser class
2014-11-11 22:46:58 +01:00
manupap1
199f399caf
Add new files for plugin management
2014-11-11 22:39:20 +01:00
manupap1
15532e2a03
Fix issues with event notes
2014-11-11 22:31:58 +01:00
manupap1
5d5d9c5009
Add support for event with multiple causes
2014-11-11 22:08:55 +01:00
manupap1
217aafee5a
Set a reference image for each zone
2014-11-11 21:48:56 +01:00
manupap1
e60c3d552c
Remove unwanted dependencies
2014-11-11 20:24:48 +01:00
Isaac Connor
1d6dffde47
Merge pull request #560 from manupap1/rtsp_fix
...
Send keepalive messages if the rtsp server supports this feature
2014-11-08 14:53:45 -05:00
Isaac Connor
b4a8ba8e8e
Merge pull request #561 from manupap1/rtsp_fix2
...
Use our own SSRC when sending packets on the RTP control stream
2014-11-08 14:52:36 -05:00
Isaac Connor
3e8d49d88d
add comment to improve understanding
2014-11-08 14:50:44 -05:00
manupap1
336c69e3c0
Use our own SSRC when sending packets on the control stream
2014-11-07 19:38:11 +01:00
manupap1
ea8b93be84
Use our own SSRC when sending packets on the control stream
2014-11-07 19:15:42 +01:00
manupap1
ee7d6a6254
Send keepalive messages if the rtsp server supports this feature
2014-11-07 17:39:50 +01:00
Andrew Bauer
23ee96c966
Merge pull request #556 from ZoneMinder/add_join
...
Add a stringVector join function for future use
2014-11-06 08:33:28 -06:00
manupap1
e764938a0d
Fixed bug in rtsp streaming caused by a bad string concatenation
2014-11-06 10:16:28 +01:00
Isaac Connor
a88ce80716
Add a stringVector join function for future use
2014-11-05 14:01:48 -05:00
manupap1
fefc17b0fc
Fixed bug in rtsp streaming caused by a signed - unsigned conversion.
2014-11-05 19:08:57 +01:00
Isaac Connor
57e5b4fee8
Fix segfault on zmu -l due to not connectig to the shared mem
2014-10-23 09:00:53 -04:00
Isaac Connor
8a33f78243
bugfix; coredump if no codec name was specified in url.
2014-10-15 14:35:01 -04:00
Isaac Connor
2a71973307
make zm compile using libav on ubunut 14.04
2014-10-15 13:23:29 -04:00
SteveGilvarry
6cb96f1316
Put opts back in
2014-10-12 16:47:27 +11:00
Sune1337
7534557533
- join reconnect thread when finished to clean up thread resources.
...
- don't spawn a new thread for every attempt to open a stream while reconnecting.
2014-10-12 16:31:27 +11:00
Sune1337
a865a555f2
Define AV_ERROR_MAX_STRING_SIZE after all include files to use ffmpeg define if it exists.
2014-10-12 16:31:27 +11:00
Sune1337
f32b1276df
Define AV_ERROR_MAX_STRING_SIZE to 64 if it is not already defined.
2014-10-12 16:23:58 +11:00
Sune1337
83d2a494c3
Process should exit if ReopenFfmpeg function fails to create a worker thread.
2014-10-12 16:23:58 +11:00
Sune1337
7de59df080
removed use of av_err2str. someone could not compile when using that macro.
2014-10-12 16:23:58 +11:00
Sune1337
a307b8a1e3
Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file.
2014-10-12 16:23:58 +11:00
Sune1337
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
Andrew Bauer
0bb2d9f81d
Merge pull request #407 from m-bene/rtspDigest
...
Rtsp digest
2014-10-11 17:39:57 -05:00
Andrew Bauer
9ef9b17c6b
fixes ftbs with no ffmpeg support
2014-10-11 17:14:09 -05:00
Andy Bauer
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
Isaac Connor
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
Isaac Connor
1076a621c8
fix crashes
2014-09-08 16:56:40 -04:00
Isaac Connor
8891639767
fix another segfault
2014-09-08 16:46:41 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
83870b911d
debugging in progress but builds
2014-08-21 11:53:14 -04:00
Isaac Connor
5a7c989ccd
remove some crap that I pushed
2014-08-21 11:52:35 -04:00
Isaac Connor
c6d19b3ecf
whitespace issue
2014-08-21 11:14:38 -04:00
Isaac Connor
3d8ad2c906
fall back to Config table setting for v4l MultiBUgger and captures per frame.
2014-08-21 09:59:08 -04:00
Isaac Connor
92d110859d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-08-19 09:12:45 -04:00
Isaac Connor
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
Kyle Johnson
6d92299d46
Merge pull request #440 from kylejohnson/master
...
Cleaning up the Contribution section of the README
2014-08-12 11:13:46 -04:00
root
cca01dc357
connect to the monitor, because instantiating the object no longer does that
2014-07-30 14:20:48 -04:00
Isaac Connor
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
Isaac Connor
7147d47a76
Improve error messages when empty mmap file to reduce FAQ
2014-07-29 09:45:19 -04:00
Isaac Connor
585a1c50a1
Merge branch 'nommap'
2014-07-24 14:40:37 -04:00
Isaac Connor
edd794a993
ensure captures_per_frame >0
...
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-07-14 14:07:28 -04:00
Isaac Connor
4f694ee8cf
fix
2014-07-14 13:07:23 -04:00
Isaac Connor
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
Isaac Connor
9385471392
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-07-13 16:39:27 -04:00
Andrew Bauer
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
Isaac Connor
6e22278f74
password might be null when auth_relay is none.
2014-06-27 12:47:56 -04:00
Isaac Connor
07dbbd46d3
only do mmap on demand
2014-06-26 14:54:47 -04:00
Isaac Connor
8f4fb8bb64
fix mysql_escape_String call. Must use strlen, not sizeof
2014-06-26 14:44:37 -04:00
Isaac Connor
20bccdf431
use the size of the username and password when calling mysql_escape_string
2014-06-25 16:23:10 -04:00
Isaac Connor
0592276f53
fix mysql_escape_string calls after referring to docs
2014-06-24 11:22:08 -04:00
Kyle Johnson
229cfcaa5b
Find the last occurrence of '@' in the host string. Fixes #443
2014-06-23 14:22:27 -04:00
Kfir Itzhak
a9cd6caeaf
Minor corrections to cURL code
2014-06-06 09:35:02 +03:00
Isaac Connor
93aed26a00
escape username and password inside zm_user
...
by rogerroger288
2014-06-05 15:18:02 -04:00
Kfir Itzhak
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
m-bene
a81b9b8ce2
change examples for options
2014-05-17 21:48:08 +02:00
m-bene
f62afdb8cc
add select list for rtsp method for ffmpeg and libvlc
2014-05-17 20:41:22 +02:00
m-bene
9a71a0068a
add help window for ffmpeg/libvlc options
2014-05-17 04:33:33 +02:00
m-bene
1b4f9c082c
change check for av_dict_set success
2014-05-15 16:01:29 +02:00
m-bene
6016206f98
modify debug message
2014-05-15 15:42:27 +02:00
m-bene
5cb7cd916f
add quotes to option debug/warn messages
2014-05-15 15:13:39 +02:00
m-bene
c1557a99e5
add debug and warn messages
2014-05-15 15:06:01 +02:00
Isaac Connor
00aad4a128
frame_count should be an integer so don't use NULL
2014-05-05 13:06:58 -04:00
Isaac Connor
8333e909ed
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-05-05 11:29:55 -04:00
Isaac Connor
a8929914bb
add a NULL test for frame_coutn before calling atoi.
2014-05-05 11:29:09 -04:00
m-bene
ae0ee9b3b3
testing/fixing
2014-05-05 15:54:13 +02:00
m-bene
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
Kfir Itzhak
4de46c7988
Fix wrong values used for type boolean
2014-05-05 09:26:32 +03:00
aztazt
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
m-bene
20528e610f
fix digest auth for RTSP using HTTP tunnel
2014-04-30 15:33:29 +02:00
m-bene
e25420efaa
add digest auth file for cmake
2014-04-29 17:31:06 +02:00
m-bene
2ccd3492bf
parse 401 response for RTP_RTSP_HTTP
2014-04-29 00:42:38 +02:00
m-bene
3595777d79
add RTSP digest authentication
2014-04-28 23:37:31 +02:00
Sune1337
48b361b1eb
- Arrays should be deleted using "delete[]" and not "delete"
2014-04-28 17:20:37 +02:00
Sune1337
a4f597696a
- render video using double buffers
...
this is to deliver frames more accurately to the client
2014-04-26 18:25:48 +02:00
Sune1337
448d287240
- use _AVCODECID_NONE instead of CODEC_ID_NONE
2014-04-25 23:22:53 +02:00
Sune1337
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
Sune1337
4767326484
A variable was referenced as a pointer when it was not.
2014-04-25 22:27:56 +02:00
Sune1337
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
Kfir Itzhak
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
Kfir Itzhak
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
Kfir Itzhak
0dbcc836b4
Merge pull request #325 from elenril/master
...
Support building with new libavcodec versions.
2014-04-19 00:08:39 +03:00
Sune1337
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
Sune1337
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
Andrew Bauer
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