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

47 Commits

Author SHA1 Message Date
Isaac Connor a5de51478e The termination callback should be private 2019-01-08 13:12:22 -05:00
Isaac Connor 89cd7ceaf8 Whitespace, extra parentheses, google code style 2018-09-23 16:47:06 -04:00
Isaac Connor 190ac69975 reintroduce FfmpegInterruptCallBack so that av_read_frame can be made to quit 2018-05-08 12:02:08 -04:00
Isaac Connor 34111251d9 Introduce Close() to camera and monitor api. Use it to close a camera when there is an error with capturing. Remove the sleep10 on error. 2018-04-17 07:02:52 -07:00
Isaac Connor 8518278476 coverity scan fixes/cleanups 2018-04-12 11:29:35 -04:00
Isaac Connor 748f78d7a6 clean out old threaded code that has been #defined out for a long time. When EOF, after re-opening, continue instead of logging the error 2018-01-28 15:17:22 -05:00
Isaac Connor 64816aa005 fixes from cppcheck. 2017-11-18 16:00:10 -05:00
Isaac Connor 159c0a7165 moer cppcheck fixes 2017-11-17 07:52:26 -05:00
Isaac Connor a63d0878b6 remove more hwaccel code 2017-08-16 13:41:44 -04:00
Isaac Connor 9e2aa941fc rough in vaapi and qsv decoders. More debugging 2017-08-16 11:31:47 -04:00
Isaac Connor cc28af8ed2 rework things to always start the recording on a video keyframe. Also fix pts/dts of remaining audio frames 2017-08-09 12:50:46 -04:00
Isaac Connor d2fb4a7874 braces, spacing cleanup. Remove unused variable wasRecording 2017-04-19 10:34:17 -04:00
Isaac Connor 59c85c1fbb change bool recording to a timeval. 2017-04-12 13:38:39 -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 0d418882e7 sorta works 2016-09-23 15:39:52 -04:00
Isaac Connor a5b7b6e74f move the input packet into a member of the camera. Fix packet copying in packetqueue. Implement separate start pts and dts for audio and video 2016-09-22 10:43:20 -04:00
Steve Gilvarry 34a85ba3f1 Moron forgot a file 2016-09-08 23:39:04 +10:00
Isaac Connor d5f60ad3f8 merge pertinent restructuring and packet queue worko 2016-08-31 16:58:59 -04:00
Steve Gilvarry d1bcb14629 Right direction 2016-09-01 00:00:10 +10:00
Steve Gilvarry 0abfb7378a Buffer work 2016-05-18 00:01:33 +10:00
Steve Gilvarry 02013cef94 Merge remote-tracking branch 'upstream/feature-h264-videostorage' into packetqueue 2016-05-03 21:15:46 +10:00
Steve Gilvarry da157f5a1a Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-04-30 22:27:10 +10: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 03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
SteveGilvarry 966fbb1a10 Add Packet Queue 2016-04-04 20:04:14 +10:00
Heng Liu 4e263f5913 Merge branch 'master' into feature-h264-videostorage 
Conflicts:
	src/zm_ffmpeg.h
 2015-11-04 14:39:52 -08: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
SteveGilvarry cc85424999 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_ffmpeg_camera.cpp
 2014-12-02 20:18:24 +11:00
SteveGilvarry 0e4156c095 Add CaptureAndRecord to vlc, still need to make it record 2014-10-23 19:56:35 +11:00
Sune1337 7534557533 - join reconnect thread when finished to clean up thread resources. 
- don't spawn a new thread for every attempt to open a stream while reconnecting.
 2014-10-12 16:31:27 +11:00
Sune1337 a307b8a1e3 Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file. 2014-10-12 16:23:58 +11:00
Sune1337 ebf466c2df - Timeout when opening stream after 10 seconds 
Sometimes when restarting the camera ffmpeg hung itself in some state, when calling avformat_open_input, which seemed to last forever.
- Reopen stream if av_read_frame returns EOF
Sometimes ffmpeg starts returning an EOF error when calling av_read_frame. Once this happens it seems no more images will ever be captured.
- Reopen stream if av_read_frame returns -110
Means something like Connection failed; cant remember. Anyway. Once this happens it seems no more images will ever be captured.
 2014-10-12 16:23:58 +11:00
stevegilvarry 17d7404c93 Merging master again 2014-06-28 22:50:28 +10:00
Will W 5051c26d31 Audio support including fixes for dts/pts, split on keyframe and update to mkv extension to prevent ffmpeg problems writing rtsp audio to mp4 containter (header problem) 2014-05-30 02:05:20 +10:00
stevegilvarry 33090f2264 Merge branch 'master' into feature-h264-videostorage 
Conflicts:
	configure.ac
	src/zm_config_defines.h
	src/zm_ffmpeg.h
	web/index.php
 2014-05-30 01:55:24 +10:00
m-bene f62afdb8cc add select list for rtsp method for ffmpeg and libvlc 2014-05-17 20:41:22 +02:00
m-bene ceff5a98ea add generic Option field to ffmpeg and libvlc cameras 2014-05-05 13:29:12 +02:00
Kevin Dalley af7a49d8d0 Change comments for many Camera subclasses so that comments match the subclass. 2014-01-27 16:52:46 -08:00
Chris Wiggins 8da327e9a3 Keep last keyframe so that as soon as the video starts to record, it has a keyframe to use rather than waiting 2013-09-28 23:26:28 +12:00
Chris Wiggins 774a84d487 Updated event processing to actually add frames into the DB. Use MP4 container 2013-09-14 00:50:54 +12:00
Chris Wiggins c61029f780 First iteration of h264 saving in the capture daemon. 
To use, enable use_mkv_storage in the paths section of the ZM config (be sure to import the new SQL config)
Must have the latest FFMPEG compiled from git with x264 linked in
 2013-09-06 15:07:46 +12:00
Kfir Itzhak 642a1bfdb2 1) RTSP support for direct capture and target colorspace. 
2) Hopefully fixed the mmap unexpected shared memory size completely this time.
3) Added 32bit RGB and grayscale support to the signal checking.
4) Fixed zms\nph-zms keeps running after changing capture options, eating CPU and has to be killed with -9.
5) Default monitor options changed again.
6) Fixed unrelated bug: Undefined constant ZM_V4L2 in monitor probe.
7) Fixed unrelated bug: Error in offset X in monitor probe.
8) Changed monitor probe's prefered capture settings.
9) Small other minor changes.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak f2aaeb78e0 1) Completed ffmpeg code 
2) Minor changes to zm_local_camera.cpp
 2012-02-01 07:33:20 +02:00
stan dde584a12a Restructured camera capture methods somewhat and revamped V4L stuff a bit. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2724 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-28 09:48:06 +00:00
stan 23d82a7e03 Added FFMPEG camera type 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2716 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-20 15:01:32 +00:00