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

57 Commits

Author SHA1 Message Date
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
Edward Barnard 9a06ec51c6 Save a couple of cpu cycles. 2013-12-02 15:37:26 +00:00
Edward Barnard 21946b5854 H264 SPS and PPS frames are now handled correctly 2013-11-30 21:59:04 +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