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

33 Commits

Author SHA1 Message Date
Sune1337 4767326484 A variable was referenced as a pointer when it was not. 2014-04-25 22:27:56 +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
Isaac Connor cdac403fb1 Merge ../zum into develop 
Conflicts:
	AUTHORS
	configure.ac
	db/zm_create.sql.in
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/zmupdate.pl.in
	src/Makefile.am
	src/zm_buffer.cpp
	src/zm_config_defines.h
	src/zm_event.cpp
	src/zm_ffmpeg.h
	src/zm_ffmpeg_camera.cpp
	src/zm_image.cpp
	src/zm_jpeg.h
	src/zm_local_camera.cpp
	src/zm_logger.cpp
	src/zm_mem_utils.h
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_mpeg.cpp
	src/zm_remote_camera_http.cpp
	src/zm_remote_camera_rtsp.cpp
	src/zm_rtsp.cpp
	src/zm_sdp.cpp
	src/zm_sdp.h
	src/zm_stream.cpp
	src/zm_thread.cpp
	src/zm_thread.h
	src/zm_threaddata.cpp
	src/zm_user.cpp
	src/zm_user.h
	src/zm_utils.cpp
	src/zm_zone.cpp
	src/zm_zone.h
	web/includes/actions.php
	web/lang/big5_big5.php
	web/lang/cn_zh.php
	web/lang/cs_cz.php
	web/lang/de_de.php
	web/lang/dk_dk.php
	web/lang/en_gb.php
	web/lang/es_ar.php
	web/lang/et_ee.php
	web/lang/fr_fr.php
	web/lang/he_il.php
	web/lang/hu_hu.php
	web/lang/it_it.php
	web/lang/ja_jp.php
	web/lang/nl_nl.php
	web/lang/pl_pl.php
	web/lang/pt_br.php
	web/lang/ro_ro.php
	web/lang/ru_ru.php
	web/lang/se_se.php
	web/skins/classic/js/skin.js
	web/skins/classic/views/js/monitor.js.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/zone.php
 2013-07-25 11:49:55 -04:00
Isaac Connor 9d89fb3bcb Merge branch 'kfir-proper' into develop 2013-05-10 12:23:58 -04:00
Isaac Connor 6db183a5ba add mathetmatics.h to fix compile 2013-04-29 13:43:48 -04:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01: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 37cc9199b2 1) Changed ZM static colours to RGB order instead of HTML(BGR) order 
2) Allow ZM to compile without swscale - hopefully
3) Saved few cpu cycles during image blending
4) Fixed wrong zone colours showing up
5) Unrelated fix: Allow ZM to be compiled with the latest ffmpeg revisions
 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 b3b715e022 Fixes to work with latest ffmpeg 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3338 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-15 20:38:51 +00:00
stan f813ff1691 Cleaned up some deprecated ffmpeg calls. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3273 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 13:21:24 +00:00
stan 60f0136ed3 Merged in image root changes 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3040 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-28 19:16:40 +00:00
stan 5ae6123ba3 Updated deprecated ffmpeg functions. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3018 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-15 17:05:53 +00:00
stan 10b01a5062 Added Panic level for debug with stack dump. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2975 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-14 10:01:46 +00:00
stan 034f37cf4b Applied contributed patch. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2890 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-25 18:03:46 +00:00
stan a02eba25ff Minor mpeg format and config changes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2868 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-08 15:24:39 +00: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 e60149ce36 Modification to streaming to avoid making stream buffer if not required. Also cycle fix. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2679 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-29 23:08:21 +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 ee44d4b274 Updated debug format 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2513 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-14 14:43:47 +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 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 ce7164a065 Bug 178 - Added support for CVS ffmpeg. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1509 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-10-16 21:32:37 +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 1589f95540 Modified to work with ffmpeg 0.4.9-pre1 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1105 e3e1d417-86f3-4887-817a-d78f3d33393f
 2004-09-23 14:20:54 +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 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