Commit Graph

26 Commits

Author SHA1 Message Date
Isaac Connor 03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
SteveGilvarry bc5ef6c599 Handle PixelFormat to AVPixelFormat change using _AVPIXELFORMAT and version
check to define correctly. Also at same time define all AV_PIX_FMT_* to
PIX_FMT_*
2015-11-04 12:46:26 +11:00
Dmitry Smirnov 0ff7a4e616 Replace deprecated FFmpeg API
Fixes FTBFS with ffmpeg-2.9; compatible with ffmpeg-2.8.

Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803850
2015-11-03 11:58:23 +11:00
Sune1337 a4f597696a - render video using double buffers
this is to deliver frames more accurately to the client
2014-04-26 18:25:48 +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
Kfir Itzhak de2df49d64 1) Added support for the new formats to the mpeg code.
2) Fixed unwanted extra call to set video format for local cameras.
3) Small changes to the perl shared memory types.
2012-02-01 07:33:20 +02:00
Kfir Itzhak 4a59761bcc Getting closer and closer everyday.
1) Fixed many errors to get it to compile
2) Fixed some small bugs
3) Small other changes
2012-02-01 07:33:20 +02:00
stan 820dce5e42 Updated for decimal frame rates.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2867 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-08 13:47:19 +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 4c2c4199ca Fixed to compile with recent ffmpeg
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2601 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-24 16:57:39 +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
stan fe53ca7a07 Bug 482 - Now handles new ffmpeg header locations.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2437 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-06-18 15:42:53 +00:00
stan ea8feae447 Updated to work with latest ffmpeg.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2256 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-17 13:17:09 +00:00
stan 1b55f15d54 Bug 416 - Added new ffmpeg swscale library
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2211 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 14:00:33 +00:00
stan 5124065e77 Bug 398 - Added new ffmpeg header patch
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2109 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-04-03 15:44:04 +00:00
stan 0fe4e4c66d Bug 351 - Fixed to compile with latest version 50 ffmpeg.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2009 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-07-04 10:46:16 +00:00
stan 235dde1a80 Updated copyright statement.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1829 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-17 10:56:30 +00:00
stan 7cd2e34d2f Bug 171 - Finally fixed ffmpeg compatibility for all 3 builds.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1669 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-09 00:25:12 +00:00
stan fa0c5348a0 Bug 223 - Added in custom mime-type initialisations.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1659 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-07 13:42:25 +00:00
stan 209f65e10f Bug 76 - Now supports CVS ffmpeg.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1497 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-03 20:38:40 +00:00
stan 264c23d687 Updated copyright statement
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1360 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-02-24 14:40:14 +00:00
stan 153b6ff8b3 Now outputs mime headers directly from ffmpeg.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1053 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-05-05 09:18:14 +00:00
stan 886c6cad6e Modified ffmpeg detection to allow for installation.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@981 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-03-18 21:24:05 +00:00
stan 1aa2bdc76f Added timestamping to video generation.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@930 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-03-08 10:33:19 +00:00
stan e30fc4ac2c Changed bit_rate to bitrate
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@927 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-03-05 10:40:45 +00:00
stan 3d245e1ab0 Merged in MPEG streaming.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@916 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-03-04 15:05:54 +00:00