Commit Graph

556 Commits

Author SHA1 Message Date
Isaac Connor 03d3f5e665 Merge branch 'storageareas' into zma_to_thread 2018-03-03 13:28:01 -08:00
Isaac Connor 91c9714e43 cleanup 2018-03-02 18:26:21 -08:00
Isaac Connor 28342b907b add a thread for deleting the event. This is because writing out the final frames of an mp4 can take a long time, during which we are not analyzing. 2018-03-01 19:22:22 -08:00
Isaac Connor c443168389 split out codec and encoder, allowing one to specify which encoder to use 2018-02-28 07:17:16 -08:00
Isaac Connor 3586825c90 fix preevent_count==0 causing div/0 2018-02-26 17:08:05 -08:00
Isaac Connor d514e95606 Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread 2018-02-17 12:26:08 -05:00
Isaac Connor 84b7e85259 Add a mutex around mysql operations 2018-02-15 15:54:13 -05:00
Isaac Connor 9fd2b6be52 fix fps reporting 2018-02-15 14:07:55 -05:00
Isaac Connor b5e0745ac7 Merge branch 'storageareas' into zma_to_thread 2018-02-14 13:56:03 -05:00
Isaac Connor 657fda818b code docs 2018-02-13 05:26:30 -05:00
Isaac Connor cd606dbab8 whitespace 2018-02-07 08:03:01 -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 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 4b7ddd81bf Merge branch 'storageareas' into zma_to_thread 2018-02-02 14:24:02 -05:00
Isaac Connor 868e17a414 Allow Method in Monitors to be NULL 2018-02-02 10:31:55 -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 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 6a42dab4e8 Fix 2018-01-24 12:18:39 -05:00
Isaac Connor 71263c525b :Merge branch 'storageareas' into zma_to_thread
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_monitor.cpp
2018-01-24 11:55:32 -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 e37d27e972 Merge branch 'storageareas' into zma_to_thread
Conflicts:
	src/zm_monitor.cpp
2018-01-18 13:44:26 -05:00
Isaac Connor 59a1272307 bump version 2018-01-18 11:39:33 -05:00
Isaac Connor a2211bf438 Merge branch 'storageareas' into zma_to_thread
Conflicts:
	src/zm_event.cpp
	src/zm_monitor.cpp
2018-01-16 13:36:57 -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 0ea6fd9807 Merge branch 'storageareas' into zma_to_thread 2017-12-19 14:06:58 -05:00
Isaac Connor e16852ee8e fix compile, impose minimum 10 second event length 2017-12-18 13:39:08 -05:00
Isaac Connor 14eedf4927 rework state machine 2017-12-16 17:07:53 -05:00
Isaac Connor 49214a8902 Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread 2017-12-15 10:47:53 -05:00
Isaac Connor ebcd63f280 fixes to compile using avconv 2017-12-15 10:47:44 -05:00
Isaac Connor 212cd7e6c4 tidy ups 2017-12-15 10:46:43 -05:00
Isaac Connor bcdadc67bf Merge branch 'storageareas' into zma_to_thread 2017-12-12 15:29:19 -05: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 dd384e9e6d reduce wait time when waiting for first frame 2017-12-08 21:29:05 -05:00
Isaac Connor af37eeeeed fix int64 = int*int multiply 2017-12-08 15:17:45 -05:00
Isaac Connor aff08358f4 more debug 2017-12-08 13:46:02 -05:00
APHW2 MFGENG 0cfc42b9fd some cleanups/fixes 2017-12-05 13:16:52 -08:00
Isaac Connor 4d73ce4109 rework locking to have a per-packet mutex 2017-12-03 11:09:01 -05:00
Isaac Connor 0ef9d13dbd Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread 2017-12-01 18:50:46 -05:00
Isaac Connor 3ca9b36877 fixes to compile on old ffmpeg 2017-12-01 18:50:28 -05:00
APHW2 MFGENG 4a9c31a15d wip 2017-12-01 15:42:19 -08:00
Isaac Connor b87e459125 still corrupting memory 2017-12-01 14:48:30 -05:00
Isaac Connor 2e3fda488e more debug 2017-12-01 14:33:51 -05:00