ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,941 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

40 Commits

Author SHA1 Message Date
Isaac Connor 159c0a7165 moer cppcheck fixes 2017-11-17 07:52:26 -05:00
Isaac Connor 23b40da598 fix whitespacing causing a warning when compiling. In this case braces are not neccessary. 2017-01-11 14:25:12 -05:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor fd896acd50 Merge branch 'RTSP-IPv6' of https://github.com/schrorg/ZoneMinder into schrorg-RTSP-IPv6 2016-05-06 08:32:21 -04:00
Isaac Connor 03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
SteveGilvarry af76d19646 Add a constrained namespace implementation around Authenticator class to prevent conflict with libvlc live555. 2015-12-18 01:47:10 +11:00
Robin Daermann 4c773472bd Add support for IPv6 in RTSP code 
Monitors with source type 'remote' can now be accessed over IPv6. This
code uses getaddrinfo(3) now instead of gethostbyname(3) - and changes a
lot of networking stuff which should be tested thoroughly.
 2015-11-04 16:41:47 +01:00
Andrew Bauer 22dc049bf4 remove Info statement used for testing 2015-08-21 10:34:23 -05:00
Andrew Bauer a2d7ac86fe add rtsp_describe to RtspThread class 2015-08-21 10:29:54 -05:00
Isaac Connor ec6c6b3ace typo fix 2015-06-22 09:26:17 -04:00
Emmanuel Papin a36b4aa65d Implement version check for ffmpeg and libav (address issue #580) 2015-05-29 17:38:02 +02:00
Dmitry Smirnov eddada011c spelling corrections (thanks, /usr/bin/codespell) 2015-04-19 20:38:23 +10:00
Isaac Connor 084e2a8b8f when auth is needed, try command again before dying. 2015-03-02 10:47:52 -05:00
Isaac Connor 3c5b1fd07f fix extra slash when adding trackurl to controlurl 2015-02-26 10:22:21 -05:00
Isaac Connor 0355191c6c Merge pull request #687 from knnniggett/rtsp-content-base 
process RTSP DESCRIBE response header
 2015-02-21 17:44:49 -05:00
Andrew Bauer 6c65c89643 Merge pull request #711 from SteveGilvarry/720_avformat_free_context_version_check 
Fixes #710 Added libavformat version check around free context functions
 2015-02-18 07:26:18 -06:00
SteveGilvarry 83cc398a24 Added libavformat version check around free context functions 2015-02-18 23:25:31 +11:00
Andrew Bauer 82af43f5fb process RTSP DESCRIBE response header 2015-01-31 08:31:27 -06:00
Isaac Connor 56c82cfbb5 Save 1 or more calls to time(NULL) 2015-01-28 12:33:05 -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 32e818e860 Check for RTSP timeout in PLAY command response 2014-12-01 16:58:42 -06: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
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
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
manupap1 ee7d6a6254 Send keepalive messages if the rtsp server supports this feature 2014-11-07 17:39:50 +01:00
manupap1 e764938a0d Fixed bug in rtsp streaming caused by a bad string concatenation 2014-11-06 10:16:28 +01:00
Andrew Bauer 0bb2d9f81d Merge pull request #407 from m-bene/rtspDigest 
Rtsp digest
 2014-10-11 17:39:57 -05:00
m-bene 20528e610f fix digest auth for RTSP using HTTP tunnel 2014-04-30 15:33:29 +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 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
Edward Barnard 560d9bd809 RtpSource can now distinguish between payload types and handles some properly. 2013-11-28 21:32:06 +00: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
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00