Commit Graph

57 Commits

Author SHA1 Message Date
Peter Keresztes Schmidt 39a896f5b6 utils: cleanup StartsWith 2021-04-03 23:51:12 +02:00
Peter Keresztes Schmidt 664cd649f8 utils: cleanup Trim (was trimSet) and TrimSpaces 2021-04-03 23:30:59 +02:00
Peter Keresztes Schmidt 8f0431d85b RtpDataThread: Convert to std::thread 2021-03-03 23:31:53 +01:00
Peter Keresztes Schmidt 71edb9d830 RtpCtrlThread: Convert to std::thread 2021-03-03 23:31:53 +01:00
Peter Keresztes Schmidt ff2bfb58da RtspThread: Fix an unguarded SQL query causing race conditions 2021-03-03 23:31:53 +01:00
Peter Keresztes Schmidt 8f941c75cd RtspThread: Convert to std::thread 2021-03-03 23:31:53 +01:00
Peter Keresztes Schmidt a66a9a6f10 Rtsp: Use AvStream.codecpar if available
.codec has been deprecated in libavf 57.33.100
2021-02-10 00:21:23 +01:00
Peter Keresztes Schmidt 4056782954 Comms: Move all classes to ZM:: namespace
The Socket class collides with a class named the same way from liblive555. This confuses the linker and links the wrong object leading to a crash when connecting to the RTSP server.
2021-02-09 14:45:33 +01:00
Isaac Connor 87c3a862e2 remove our copies of min() and max(). Use std::min() and std::max() 2021-02-06 16:02:09 -05:00
Peter Keresztes Schmidt 0dbc39ee25 Cleanup and reorganize includes
With this commit a unified structure for includes is introduced.
The general rules:
 * Only include what you need
 * Include wherever possible in the cpp and forward-declare in the header

 The includes are sorted in a local to global fashion. This means for the include order:
  0. If cpp file: The corresponding h file and an empty line
  1. Includes from the project sorted alphabetically
  2. System/library includes sorted alphabetically
  3. Conditional includes
2021-02-04 18:02:01 +01:00
Isaac Connor 63a6bdaac1 spacing 2021-01-29 09:53:48 -05:00
Isaac Connor c4b80e61bc code comments 2021-01-27 16:14:17 -05:00
Isaac Connor 16662f79ce spacing and code stylez 2020-12-27 12:03:44 -05:00
Peter Keresztes Schmidt 8f980a1168 Convert NULL/0 to nullptr
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
Isaac Connor b1b258ab9b Code Style and use backtick escapes on sql column names, specifically Function 2020-05-07 13:43:05 -04:00
Isaac Connor 28269eccc3 Fix Remote RTSP Method on newer ffmpeg 2019-04-28 12:05:32 -04:00
Isaac Connor 5120c6f540 remove compile warning by assigning AV_CODEC_NONE to the codec_id. 2018-11-13 18:13:55 -05:00
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