Isaac Connor
73239a0dba
If no progress in analysis, bail
2018-04-14 17:03:45 -04: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
f9f78e9aa3
Convert event_id to a 64bit unsigned int
2018-04-12 13:40:11 -07:00
Isaac Connor
8518278476
coverity scan fixes/cleanups
2018-04-12 11:29:35 -04:00
Isaac Connor
c766c1ddd1
spacing cleanup
2018-04-12 10:28:22 -04:00
Isaac Connor
71d5984eb0
delete stream after use
2018-04-12 10:26:18 -04:00
Isaac
64cfb39043
do an initial fps report early on
2018-04-06 23:21:22 +02:00
Isaac Connor
ec5f955d26
more db locking
2018-04-05 11:30:14 -04:00
Isaac Connor
dfc35721f9
ensure that sections are always > section_length
2018-04-03 07:03:12 -07:00
Isaac Connor
a5b77a59d3
allow 0 pre_event_count
2018-03-29 12:35:03 -04:00
Isaac Connor
b22911f554
wait to closeEvent on monitor shutdown
2018-03-28 14:03:56 -04:00
Isaac Connor
b8a792cfb7
whitespace google code style
2018-03-27 11:04:40 -04:00
Isaac Connor
bcc7011871
update sql loading code in Reload, which will automatically do the db locking
2018-03-27 10:04:19 -04:00
Isaac Connor
11cf3ce482
whitespace
2018-03-22 11:33:24 -04:00
Isaac Connor
e8e310b156
Merge branch 'storageareas' into zma_to_thread
2018-03-15 11:45:32 -04:00
Isaac Connor
ea38f7cca4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-15 11:43:15 -04:00
Isaac Connor
e523067df7
Merge branch 'storageareas' into zma_to_thread
2018-03-15 11:28:14 -04:00
Isaac Connor
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
Isaac Connor
6f3d16fe10
label_format can be null
2018-03-13 12:06:03 -07:00
Isaac Connor
cefd00d1ea
load User and Pass as well
2018-03-13 14:50:41 -04:00
Pliable Pixels
704ccaee73
2059 alarm cause ( #2060 )
...
* added alarm_cause as a test
* initial attempt to integrate with notes
* testing sizeof
* add zone labels
* fixed typo
* fixed typo
* comments and formatting
* Downgraded invalid attribute to error
* Removed Error downgrade. Instead do a undefined check on field params
* Added help text
2018-03-12 19:38:12 -04:00
Isaac Connor
5ca7871510
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2018-03-10 10:12:22 -05:00
Isaac Connor
2291816f4e
fix memleak
2018-03-10 10:12:12 -05:00
Isaac Connor
a419906361
Merge branch 'storageareas' into zma_to_thread
2018-03-09 09:03:19 -05:00
Isaac Connor
7fb1c8921b
reorder functions to put them in a better order
2018-03-09 07:50:47 -05:00
Isaac Connor
dcf7c4fdde
rework loading Monitor using consistent db query
2018-03-09 07:23:40 -05:00
Isaac Connor
80127cbf81
Merge branch 'storageareas' into zma_to_thread
2018-03-06 10:57:49 -05:00
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
f00983b450
Don't setup snap and timestamp if it's an audio packet
2018-02-27 20:19:39 -05:00
Isaac Connor
3586825c90
fix preevent_count==0 causing div/0
2018-02-26 17:08:05 -08:00
Isaac Connor
ee1eef50cb
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2018-02-18 11:00:55 -05: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
ec7f2e48d0
add back AnalysisFPS reporting and move the gettimeofday in after it is actually needed
2018-02-17 10:54:53 -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