480 Commits

Author	SHA1	Message	Date
Isaac Connor	cd606dbab8	whitespace	2018-02-07 08:03:01 -05:00
Isaac Connor	a4c956da7d	Only update db entry when value changes	2018-02-05 22:59:22 -05:00
Isaac Connor	e25af4b40c	cleanup, reset result	2018-02-02 16:07:13 -05:00
Isaac Connor	868e17a414	Allow Method in Monitors to be NULL	2018-02-02 10:31:55 -05:00
Isaac Connor	cfb0461fcf	Rename column Id to MonitorId in MonitorStatus	2018-01-29 09:31:43 -05:00
Isaac Connor	057509637a	TUrn a warning into a debug	2018-01-28 15:16:06 -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 Connor	59a1272307	bump version	2018-01-18 11:39:33 -05:00
Isaac Connor	26cea49f1a	handle nulls in event_prefix and label_format in Monitor::Reload	2018-01-16 11:08:35 -05:00
Isaac Connor	2c121fb784	If we get a term signal while waiting for zmc, die.	2018-01-12 07:12:54 -08:00
Isaac Connor	a304af727b	debug GetFPS	2017-12-12 14:37:02 -05:00
Isaac Connor	70d43d2d27	fix strncpy calls	2017-12-12 13:42:48 -05:00
Isaac Connor	34668db43b	use return value of WriteJpeg	2017-12-12 13:39:36 -05:00
Isaac Connor	fe74c41723	fix integer division instead of double	2017-12-12 12:56:19 -05:00
Isaac Connor	db915b2c56	Don't do an unneccesary assignemnt	2017-12-12 12:52:30 -05:00
Isaac Connor	f8738f2387	quiet coverity	2017-12-12 12:37:49 -05:00
Isaac Connor	344539f5dc	cleanup	2017-11-28 11:55:47 -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	4b92a788f7	fix filter execute	2017-11-24 15:37:50 -05:00
Isaac Connor	ebe3073c59	only update fps if we have an image capture	2017-11-21 23:57:01 -05:00
Isaac Connor	a9419064ef	don't calc fps if no time has passed	2017-11-07 09:35:13 -05:00
Isaac Connor	ee96f58ac4	fix fps reporting value when Capture doesn't return a new frame	2017-11-05 09:59:06 -05:00
Isaac Connor	cab8c4cd5e	cleanup Monitor::Capture. Cleanup the return values from Capture and CaptureAndRecord. <0 is error, 0 is things ok, but no video frame. > 0 means we have a frame. Plus google code style	2017-11-03 13:49:42 -04:00
Isaac Connor	cfaf10335b	add Monitor status, capturrFPS and AnalysisFPS to processes	2017-10-24 16:08:31 -07:00
Isaac Connor	fece06c9e3	google code style	2017-10-19 17:12:36 -04:00
Isaac Connor	965e1e8bc1	improve readability of debug statement	2017-10-18 10:22:53 -07:00
Isaac Connor	df1fa97e0c	handle nulls in StorageId and device	2017-10-06 16:17:37 -04:00
APHW2 MFGENG	354262c557	wip nvsocket	2017-10-03 13:28:56 -07:00
Isaac Connor	5c13ae26e3	Merge branch 'storageareas' into work_on_zms	2017-08-23 10:43:19 -04:00
Isaac Connor	676c4b7ddc	Merge branch 'master' into storageareas	2017-08-22 09:52:14 -04:00
Andrew Bauer	ac5d1738ea	allow changing of the timestamp char code delimeter (#1972)	2017-08-21 11:27:11 -04:00
Isaac Connor	014951bf78	fix connect	2017-08-11 13:00:18 -04:00
Isaac Connor	83f8a240d5	blah	2017-08-11 12:20:46 -04:00
Isaac Connor	daee5b4450	experiment with no ffmpeg thread	2017-08-11 12:03:37 -04:00
Isaac Connor	49319990fa	Don't keep setting the event_file unnecessarily. Add some code comments	2017-07-26 10:38:18 -04:00
Isaac Connor	b73c0ba978	rough in zm_ffmpeg_input and split out eventstream	2017-06-22 17:58:32 -04:00
Isaac Connor	085d239a6e	Merge branch 'master' into storageareas	2017-06-13 18:02:28 -04:00
Andrew Bauer	bacf65ae9a	Migrate values from Options -> Paths to zm.conf (#1908) ... * initial commit to migrate contents of Options->Paths to zm.conf * remove paths items from configdata.pm * remove paths tab from options * update deb packaging scripts with new cmake vars * remove extraneous file * save custom paths variables to config file before dB is freshened * don't check configs if the dB version is >= 1.31.0	2017-06-12 21:39:37 -04:00
Isaac Connor	a515041e14	Merge branch 'master' into storageareas	2017-05-23 15:17:46 -04:00
Isaac Connor	457d7e5c94	code documentation, whitespace	2017-05-20 09:03:51 -04:00
Isaac Connor	7caeee6bf8	Merge branch 'master' into storageareas	2017-05-19 15:09:44 -04:00
Isaac Connor	afb450573d	fix	2017-05-19 15:08:04 -04:00
Isaac Connor	e7ca892efd	merge more differences from SA	2017-05-19 15:07:41 -04:00
Isaac Connor	61204a8b83	Merge branch 'master' into storageareas	2017-05-19 14:11:29 -04:00
Isaac Connor	41cf0a2458	add back analysis fps	2017-05-19 14:05:24 -04:00
Isaac Connor	8568c95fbe	handel NULLS in db fields	2017-05-19 14:03:28 -04:00
Isaac Connor	f4224bb88e	Merge branch 'master' into storageareas	2017-05-17 17:47:39 -04:00
Isaac Connor	eef5e5cd90	Merge branch 'feature-h264-videostorage'	2017-05-16 13:37:24 -04:00
Isaac Connor	b1f8485969	Fix videostorage (#1885) ... * merge relevant c bits to make h264 recording work * h264 code requires libavresample and boost * Need libavresample	2017-05-16 12:04:56 -04:00