mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-22 07:43:09 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,829 Commits 80 Branches 104 Tags
d2e849104c021a894258c8ae9f72c8da7c670aa7
Commit Graph

948 Commits

Author SHA1 Message Date
manupap1
d2e849104c Fix memory leaks with rtsp and a bug 2014-11-14 22:31:03 +01:00
manupap1
f05699a005 Fix a bug when closing RTSP session over TCP 2014-11-14 11:17:27 +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
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
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