mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-02-07 04:51:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
20,251 Commits 70 Branches 102 Tags
6d17aa4b77f842fed13bd9bff91b1da98ef4b2bb
Commit Graph

40 Commits

Author SHA1 Message Date
Isaac Connor
c8c09e560f Fix mTerminate not being initialised. 2022-01-25 14:27:39 -05:00
Peter Keresztes Schmidt
f374b319e0 RtpSource: Convert internals partially to std::chrono 
This allows us to remove the tvNow() helper method.
 2021-06-13 16:35:27 +02:00
Peter Keresztes Schmidt
6c68397249 Time: Convert some timeval operations to std::chrono 
Also remove now defunct timeval helper methods.
 2021-06-07 23:53:53 +02:00
Peter Keresztes Schmidt
a9ad5c5eee Build: Promote libavcodec to a required dependency 
FFmpeg is an integral component of ZM. Promote the appropriate libraries to required dependencies.
This reduces the possible build configurations greatly and thus maintenance burden.
 2021-06-05 14:25:54 +02:00
Peter Keresztes Schmidt
68bedfe48f Fix logging format string mismatches 
* Remove SZFMTD format macro and use %zu instead for size_t. %zu is understood by every compiler nowadays.
 2021-04-30 00:26:24 +02:00
Peter Keresztes Schmidt
d9568a98c0 Drop zm_thread which has been replaced by STL implementations 2021-03-04 10:55:46 +01:00
Peter Keresztes Schmidt
69185e2204 RtpSource: Convert ThreadData with std::condition_variable 2021-03-03 23:31:53 +01: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
16662f79ce spacing and code stylez 2020-12-27 12:03:44 -05:00
Isaac Connor
87d0eb88b7 code style, merge Debug lines and consult zm_terminate in the main while loop 2020-05-07 13:41:29 -04:00
Isaac Connor
15a1b19b42 spaces 2019-09-23 10:53:21 -04:00
Isaac Connor
28269eccc3 Fix Remote RTSP Method on newer ffmpeg 2019-04-28 12:05:32 -04:00
Isaac Connor
d53639c2bf fix braces 2017-04-18 14:17:48 -04:00
Isaac Connor
5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer
254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor
ce22e6534e fix tabs 2016-06-21 12:26:08 -04:00
Isaac Connor
765f79a87f Merge branch 'icon_video' into storageareas 2016-04-06 11:16:38 -04:00
Isaac Connor
2f1376950a spelling fix 2016-04-06 10:50:12 -04:00
Isaac Connor
30d2b475eb increase log level on some success debug statements 2016-04-06 08:39:33 -04:00
Isaac Connor
9a795432cf merge all the commits from the messed up iconnor_video branch 2016-04-05 17:14:46 -04:00
Isaac Connor
60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor
04800afaf5 Some documenting comments and debug lines, mostly just trying to understand what the code does 2016-04-05 12:30:22 -04:00
Isaac Connor
be13e56c3c add some comments 2016-04-04 21:58:16 -04:00
Isaac Connor
03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04: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
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
Anton Khirnov
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
Kfir Itzhak
f39667c0cd Fix ZM not compiling with ZM_NO_FFMPEG=ON since #259, closes #285 2014-01-01 18:19:42 +02:00
Edward Barnard
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
Edward Barnard
5d9dcba2d8 Adds support more H264 NAL types and tidies function 2013-11-30 22:00:52 +00:00
Edward Barnard
80d172efa1 The last packet of a fragmented mpeg4 frame is no longer rejected. 2013-11-29 16:15:56 +00:00
Edward Barnard
3665c3ee3a Fixed bug in mpeg4 depacketizer and RTCP implementation. 2013-11-28 23:07:46 +00: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
stan
b079f1e1c6 Updated to use standard types. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3087 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-07-04 18:00:35 +00:00
stan
a91d2a0697 Rationalised and renamed buffer class. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2657 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-09 09:15:23 +00:00
stan
e6041e24a7 Uppdated copyright headers 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2611 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-25 09:33:23 +00:00
stan
f6a029bc4d Updated properties 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2608 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-25 09:08:15 +00:00
stan
d598f54210 Merged in V4L2 initial changes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2582 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-21 15:20:52 +00:00
stan
aa26ab7b18 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2532 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-16 08:35:59 +00:00