mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-07-08 04:05:32 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,111 Commits 99 Branches 106 Tags
6a8db582ffb480caa4eaa47fd87201501aa4740a
Commit Graph

126 Commits

Author SHA1 Message Date
Isaac Connor
6a8db582ff whitespacing updates 2016-06-21 12:21:18 -04:00
Isaac Connor
c3628a8dfd Merge branch 'updated-console' into storageareas 2016-05-03 14:34:58 -04:00
Steve Gilvarry
8452c4bce5 Fix tab to spaces merge issues 2016-04-29 21:27:28 +10:00
Isaac Connor
71d79fac99 Merge ../ZoneMinder.SteveGilvarry into valgrind 2016-04-20 09:59:08 -04:00
Isaac Connor
03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
Isaac Connor
c7e766faef finish the record_audio constructor defs 2016-03-31 13:30:31 -04:00
Isaac Connor
c26dbb9028 rough in record_audio, and do lots of whitespace cleanups 2016-03-31 12:54:56 -04:00
SteveGilvarry
2122d6e443 Fix all the av_picture related deprecations 2016-03-03 01:03:55 +11:00
SteveGilvarry
5ba13f1a76 ffmpeg 2.9 patched removed SSE2 CPU flags as these are automatically detected 
for all ffmpeg versions circa 2010. This commit removes the if statement on
duplicated functions.
 2015-11-04 16:24:39 +11:00
SteveGilvarry
51914994f7 Migrating from av_free/av_freep to av_frame_free using libavcodec version 
check. Also replaced recently deprecated av_free_packet with av_packet_unref.
 2015-11-04 15:30:14 +11: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
Emmanuel Papin
a36b4aa65d Implement version check for ffmpeg and libav (address issue #580) 2015-05-29 17:38:02 +02:00
Isaac Connor
79398a2bec Merge pull request #821 from onlyjob/PBP 
beautifying *.pm
 2015-05-08 08:56:01 -04:00
Isaac Connor
209f23cc6e Fix build issues on kFreeBSD. Fixes #771 2015-04-20 12:53:02 -04:00
Dmitry Smirnov
eddada011c spelling corrections (thanks, /usr/bin/codespell) 2015-04-19 20:38:23 +10:00
Andrew Bauer
5994811f88 Allow zm to build w/o ffmpeg 2015-02-21 11:02:38 -06:00
Isaac Connor
e807560d86 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-02-17 11:47:30 -05:00
Isaac Connor
4439187f19 Better debug output, handle ENOTTY in STANDARD ENUMERATION 2015-02-10 11:53:50 -05:00
Isaac Connor
e713aa44f4 small improvements: 
First is some more debugging lines useful for figuring out why automatica palette selection didn't work.
The other is a comment about how the code will segfault if there are more than 64 formats.  Currently there are not.
Lastly witch a variable from int to unsigned int.  There is no way for it to go negative and logically should always be positive, so by making it an unsigned in we don't have to cast it later.
 2015-02-10 11:11:54 -05: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
Isaac Connor
1076a621c8 fix crashes 2014-09-08 16:56:40 -04:00
Isaac Connor
8891639767 fix another segfault 2014-09-08 16:46:41 -04:00
Isaac Connor
9a3b685016 fixes for vl_multi_buffer parsing when column is NULL 
fix in debug output for local cameras causing a segfault
 2014-09-08 15:20:35 -04:00
Isaac Connor
5a7c989ccd remove some crap that I pushed 2014-08-21 11:52:35 -04:00
Isaac Connor
3d8ad2c906 fall back to Config table setting for v4l MultiBUgger and captures per frame. 2014-08-21 09:59:08 -04:00
Isaac Connor
edd794a993 ensure captures_per_frame >0 
add missing lang entries for MultiBuffer and CapturesPerFrame
 2014-07-14 14:07:28 -04:00
Isaac Connor
99a3684fb5 change the way v4l_multi_buffer is loaded. Since t's a bool, it theoretically is 1 byte, so can't use atoi 2014-07-14 12:53:48 -04:00
Isaac Connor
9385471392 move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera 2014-07-13 16:39:27 -04: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
3ded7276e1 Attempt to fix zmu "Error, failed to enumerate standard X: Success" 
http://www.zoneminder.com/forums/viewtopic.php?f=30&t=21803
 2014-01-10 13:40:52 +02:00
Kfir Itzhak
e9f4479171 Added support for UYVY capture palette (required for some Bluecherry cards) 2013-12-10 15:13:48 +02:00
mastertheknife
5a9364703c a better fix for the sign comparison warnings during compilation 2013-09-17 10:28:59 +03: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
1c3f6a9637 fix typos 2013-04-29 13:45:27 -04:00
Isaac Connor
bd5e2da5c7 fix for kernel3.5 2013-04-29 13:29:51 -04:00
nextime
33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00
Kfir Itzhak
f27b424503 Much more progress! 
1) Removed the V4L2_CAPTURE_FIELDS option.
2) V4L2 Interlacing control options added to the new per-monitor deinterlacing option.
3) Fixed the 32bit version of Linear.
4) Added Blend (50%) and Blend (25%).
5) Completed the grayscale version of the Four Field Motion Adaptive deinterlacing algorithm.
 2012-07-13 20:11:16 +03:00
Kfir Itzhak
40a8dd9b63 Automatic capture palette selection now displays the selected capture palette in the log (only for zmc). 2012-03-07 15:02:27 +02:00
Kfir Itzhak
2dfdc8129c Few small fixes: 
1) Added a workaround against SWS_CPU_CAPS_SSE2 not being defined.
2) Fixed enableDisableAlarms javascript error.
3) swscale unsupported format errors now include the unsupported format in the error.
4) Fixed a small error affecting local cameras with rotation enabled.
 2012-03-07 14:33:09 +02:00
Kfir Itzhak
fc1807f433 Fixed possible small stack corruption. 2012-02-01 07:33:21 +02:00
Kfir Itzhak
af821828b8 Changed a few warnings 2012-02-01 07:33:21 +02:00
Kfir Itzhak
de015761c1 Fix different palettes warning showing up when using automatic palette selection. 2012-02-01 07:33:21 +02:00
Kfir Itzhak
b4921c4403 1) Made 24bit the default target colorspace. 
2) Changed crop info's layout.
 2012-02-01 07:33:21 +02:00
Kfir Itzhak
349e18b543 Few text corrections. 2012-02-01 07:33:21 +02:00
Kfir Itzhak
ca57ae6438 1) Fixed and refinished the JPEG and MJPEG capture palettes support. 
2) Added the SSE2 alarmedpixels code, although its unused at the moment.
3) Small changes in libjpeg interaction.
4) Small other changes.
 2012-02-01 07:33:21 +02:00
Kfir Itzhak
066fe89718 Added automatic capture palette selection. 2012-02-01 07:33:21 +02:00
Kfir Itzhak
bdf0687550 1) Added support for JPEG and MJPEG capture palettes - needs to be tested 
2) Allow the blend percent to be zero, to disable blending
 2012-02-01 07:33:20 +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