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

125 Commits

Author SHA1 Message Date
Isaac Connor cf5eab4dbc Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread 2018-08-09 12:50:08 -04:00
Isaac Connor c3053a2f8a Merge branch 'storageareas' into zma_to_thread 2018-05-10 17:51:38 -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 ced208457d spacing, google code style 2018-05-07 10:13:36 -07:00
Isaac Connor 94377a4652 Merge branch 'storageareas' into zma_to_thread 2018-05-05 12:57:50 -04:00
Isaac Connor f6139d33ed Merge branch 'storageareas' into zma_to_thread 2018-05-05 12:25:11 -04:00
Isaac Connor 469a7347e8 include zm_terminate to make Capture break out of process is TERM'd 2018-04-30 15:09:00 -04:00
Isaac Connor 20f6985dff implement capturing bandwidth 2018-04-24 14:11:27 -04:00
Isaac Connor 4d95498664 Prevent double init of Ffmpeg by using FFMPEGInit() 2018-04-24 11:41:31 -04:00
Isaac Connor bd69f6a2ca close the videoStore when closing FFmpegCamera 2018-04-18 15:30:42 -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 c7deb91319 Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread 2018-04-14 14:58:25 -04:00
Isaac Connor cd3046abb3 Merge branch 'storageareas' into zma_to_thread 2018-04-14 11:03:08 -04:00
Isaac Connor 8518278476 coverity scan fixes/cleanups 2018-04-12 11:29:35 -04:00
Isaac da9d4c2a5c whitespace, don't pre-allocate mFormatContext 2018-04-06 23:21:40 +02:00
Isaac d8171750cd only call avformat_close_input if mformatContext still has a value. On falure it should have been freed and NULL'd 2018-04-06 23:02:15 +02:00
Isaac Connor 50696319cc Always error out when stream fails, even on EOF. Just don't log EOF as an error. 2018-03-22 09:25:35 -04:00
Isaac Connor 646f0dd65e fix merge 2018-03-03 13:31:55 -08:00
Isaac Connor 03d3f5e665 Merge branch 'storageareas' into zma_to_thread 2018-03-03 13:28:01 -08:00
Isaac Connor 4d81b7b66b Do not just reconnect to the input stream on EOF. pts/dts gets outof whack when doing passthrough. Instead treat it as a loss of signal, which will end the event and start a new one 2018-03-01 19:21:41 -08:00
Isaac Connor 902f5f098a remove debug code 2018-02-26 16:10:27 -08:00
Isaac Connor 5b55bef721 Add support for h264_mmal 2018-02-22 18:33:11 -05:00
Isaac Connor 90a668325e add mmal decoding 2018-02-22 11:56:37 -05:00
Isaac Connor 83785ac73f Merge branch 'storageareas' into zma_to_thread 2018-02-22 09:41:50 -05:00
Isaac Connor 9caa71233a catch another EOF case 2018-02-17 11:07:06 -05:00
Isaac Connor 7702e09ec2 merge fixes 2018-02-16 16:05:30 -05:00
Isaac Connor b5e0745ac7 Merge branch 'storageareas' into zma_to_thread 2018-02-14 13:56:03 -05:00
Isaac Connor 744d776d9f return when ReopenFfmpeg fails 2018-02-13 10:11:39 -05:00
Isaac Connor 162a08e81d return when ReopenFfmpeg fails 2018-02-13 10:11:05 -05:00
Isaac Connor d8e4b0abfb Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	scripts/zmwatch.pl.in
	src/zm_ffmpeg_camera.cpp
	src/zm_monitor.cpp
	src/zmc.cpp
 2018-02-06 10:34:17 -05:00
Isaac Connor e25af4b40c cleanup, reset result 2018-02-02 16:07:13 -05:00
Isaac Connor a1392bf613 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_mpeg.cpp
	src/zmc.cpp
 2018-02-02 14:23:26 -05:00
Isaac Connor 31ad807a90 If ffmpeg is open in PrimeCapture, close it. Turn all Fatals into Errors 2018-01-31 14:34:39 -05:00
Isaac Connor 67b365948e Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_monitor.cpp
	web/includes/Monitor.php
	web/skins/classic/views/js/add_monitors.js
	web/skins/classic/views/js/console.js
 2018-01-29 15:53:26 -05:00
Isaac Connor 16c24240f7 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:14:38 -05:00
Isaac Connor 50fc4a2d94 Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table. 2018-01-24 11:51:11 -05:00
Isaac 4127aa50f3 simplify logic, improve debugging 2018-01-22 03:26:25 +01:00
Isaac Connor 22df150cb2 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_packetqueue.cpp
 2018-01-17 13:59:34 -05:00
Isaac Connor 687d797303 Only log debug message about excluding audio if there is an audio stream 2018-01-17 09:53:03 -05:00
Isaac Connor 7f4deef4a9 Move debug comment about opening audio codec into the part where the audio codec is opened 2018-01-17 09:21:17 -05:00
Isaac Connor 0ea6fd9807 Merge branch 'storageareas' into zma_to_thread 2017-12-19 14:06:58 -05:00
Isaac Connor bcdadc67bf Merge branch 'storageareas' into zma_to_thread 2017-12-12 15:29:19 -05:00
Isaac Connor a9bbe3e85c remove debug lines 2017-12-12 12:36:35 -05:00
Isaac Connor bc525a4e01 blah 2017-12-02 13:55:26 -05:00
Isaac Connor 556c4d8851 debug 2017-11-30 16:10:30 -05:00
Isaac Connor c52d7c60eb finish deprecating zma 2017-11-30 15:19:31 -05:00
Isaac Connor f2efc80f22 works? 2017-11-30 14:37:36 -05:00
Isaac Connor d73f9e8a73 wip, crashes 2017-11-28 11:11:41 -05:00
Isaac Connor 1e50df741f fix some memleaks 2017-11-28 09:50:09 -05:00
Isaac Connor 24a0d717c5 wip 2017-11-21 19:55:40 -05:00