396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
369dd03909
remove errant i
2019-08-18 21:32:19 -04:00
503cf6cd24
More backticking of SQL
2019-08-17 14:37:19 -04:00
c7b6db9be7
Put backticks around all columns and tables in sql to deal with mysql 8
2019-08-14 16:18:21 -04:00
c1984ad7cb
Fix problem calculating mem_size using an int from ImageSize. With camera resolutions going up, width*height*colour could exceed 32bits. So use a guarnteed 53bit type, which fixes the memsize calculations. Fixes #2682
2019-08-11 20:21:37 -04:00
14ed777eeb
fix segfault when debbing is turned on for zma
2019-07-31 17:17:54 -04:00
48ad8d47fc
Add capture_max_fps to monitor object instead of just calculating the delay.
2019-07-31 11:23:02 -04:00
d972ab6006
add min_section_length test to alarmed events that go unalarmed
2019-06-27 21:50:12 -04:00
3bd4486b65
Start event when alarm frames >= alarm_frame_count-1 because it is 1based. Add some debug.
2019-06-27 15:48:10 -04:00
434bbce954
Add loading decoder_hwaccel in Monitor
2019-06-25 15:34:17 -04:00
c3135accbb
Make events close on a section length time boundary only if event_close_mode == CLOSE_TIME. When an alarm happens in event_close_mode==ALARM, close the continuous event regardless of the # of pre-event frames in the event. Add some debugging
2019-06-24 21:11:52 -04:00
2d80283844
simplify some logic in Analyze and prevent segfault when we close continuous event to start alarm event
2019-06-24 13:13:46 -04:00
6ed0074077
End continuous events on alarm ( #2644 )
...
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
* Spacing, google code style and tabs to spaces
* add update script to add MinSectionLength
* Add min_section_length to enforce a minimum event length when closing continuous events on alarm
2019-06-24 11:29:00 -04:00
0a8b7c24db
don't check for alarmed zones to record stats for unless we are alarmed
2019-05-24 10:52:31 -04:00
3888d140a8
Merge branch 'master' into storageareas
2019-05-17 10:16:29 -04:00
eb005e8b9c
FIFO support for zoneminder zone debugging ( #2594 )
...
Adds fifo options for diagnostic images for much lower impact diagnostics mode. Diagnostic images are only written when there is a client listening for them (otherwise they are skipped). Also added a json stream for the detection data so you can see in real time the pixels or blobs detected for the motion. This allows for easy real time stream of both delta and reference images (as video streams) along with the detection numbers.
2019-05-16 15:37:03 -04:00
c257fb46f6
Merge branch 'storageareas' of github.com:connortechnology/zoneminder into storageareas
2019-05-13 10:34:45 -04:00
aada171440
clean up some logic in Analyse
2019-05-12 09:35:48 -04:00
3a7b49560a
spacing
2019-05-06 12:16:06 -04:00
9469ce8c71
Merge branch 'section_length_when_modect' into storageareas
2019-05-06 10:50:41 -04:00
9ef912f2ba
add missing new event status info
2019-05-06 10:50:12 -04:00
aaf4665909
Merge branch 'section_length_when_modect' into storageareas
2019-05-03 09:41:41 -04:00
f6b6daafab
close and reopen event when we hit section_length
2019-05-03 09:41:29 -04:00
626342f00e
Merge branch 'master' into storageareas
2019-04-26 10:44:00 -04:00
8bbcf0f631
merge storageareas
2019-04-25 14:49:16 -04:00
077ad75516
Merge branch 'storageareas' into origin/zma_to_thread
2019-04-25 12:41:48 -04:00
ea7c38ceff
Alarm cause fix ( #2582 )
...
* move alarm cause code to when the alarm flag is set
* formatting
* added temp info log
* char* not string in log
* merged alarm clause into info message about alarm
* add a comma only if there are more active zones
* JB tweak to slightly optimize leading comma processing
2019-04-24 13:55:57 -04:00
eb76cd87bb
Revert "Alarm cause fix ( #2580 )" ( #2581 )
...
This reverts commit 6923382485
2019-04-17 13:53:11 -04:00
6923382485
Alarm cause fix ( #2580 )
...
* move alarm cause code to when the alarm flag is set
* formatting
* added temp info log
* char* not string in log
2019-04-17 13:33:38 -04:00
22adb243ec
Fix crash when reporting an event longer than section length when event was just closed so event is null.
2019-04-16 11:50:41 -04:00
2ff1e7ed6d
Fix crash when reporting an event longer than section length when event was just closed so event is null.
2019-04-16 11:30:18 -04:00
98a9c68b8b
spacing and code documentation
2019-04-15 17:54:30 -04:00
f28af7b729
store diag_path in the object and initialize them in constructor instead of constantly checking to see if they have been initialized in DetectMotion. Also use a string instead of a static char[MAX_PATH]. Also split it into diag_path_r and diag_path_d to fix the bug that only diag_path_r would ever get created and would be overwritten by the delta image.
2019-04-15 13:26:55 -04:00
93f0a03d8b
spacing and code comments
2019-04-15 12:55:28 -04:00
96b7d30d7d
Merge branch 'master' into zma_to_thread
2019-04-15 10:47:26 -04:00
69f812f5cc
force section end when seconds % section_length == 0 which is the old behaviour.
2019-04-09 19:42:24 -04:00
acb9070b04
Add a warning when an event exceeds section length
2019-03-25 12:33:30 -04:00
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
62d95e4d6e
wip deprecate a lot of the index code. We are basically just using imag_buffer[0] for current image
2019-02-26 09:45:20 -05:00
448294f593
wip
2019-02-25 10:21:43 -05:00
f2e7ec7e36
Sleep less when waiting for zmc to capture an image. Return camera in getCamera
2019-02-19 09:47:04 -05:00
baba438ce1
use image_count when reporting earlier than fps_report_interval
2019-02-16 11:49:28 -05:00
a9e2011727
Merge branch 'storageareas' into zma_to_thread
2019-02-13 12:24:38 -05:00
9f588d5758
prevent returning infinity from GetFPS
2019-01-21 13:00:10 -05:00
d068d019fb
turn section_length into seconds instead of frames
2019-01-15 11:34:17 -05:00
f726666f54
Merge branch 'master' into h265
2019-01-14 12:36:11 -05:00
751c312609
fix non-ascii char
2018-12-29 09:56:33 -05:00
32c88a3a41
Update status as well as fps when updating fps
2018-12-27 13:50:17 -05:00
db6d943854
If failure in connect, close the fd before returning
2018-12-27 11:53:21 -05:00
b87ae53a83
merge debug lines and correct spacing
2018-12-27 11:50:43 -05:00
28dafd5931
Merge branch 'storageareas' into zma_to_thread
2018-12-26 12:02:00 -05:00
1d371b7a17
Fix small memleak of linked_monitors not getting freed on Monitor destruction. Fix unlocking db mutex before logging
2018-12-20 13:41:57 -05:00
bc5f8d0d8d
rework pts/dts of audio stream. Spacing. Fix crash
2018-12-04 18:23:08 -05:00
4272225a17
Merge branch 'master' into h265
2018-11-30 16:42:16 -05:00
251ccc0ba9
remove extra ()
2018-11-26 16:20:52 -05:00
b16cd7ec84
Merge branch 'h265' into zma_to_thread
2018-11-20 12:38:17 -05:00
b291c06035
Working zms h265 playing.
2018-11-19 16:45:56 -05:00
e24a308481
Merge branch 'master' into h265
2018-11-14 17:15:37 -05:00
a95a012fa5
fix #2302
2018-11-12 11:56:18 -05:00
a8329465fb
Merge branch 'master' into h265
2018-10-22 10:30:01 -04:00
5ab1126260
Merge branch 'storageareas' into zma_to_thread
2018-10-20 17:31:14 -04:00
ee168bf427
Properly initialize preevent frames data structures. Always update analysis fps. Make some warnings on loss of signal be Info's.
2018-09-23 16:49:06 -04:00
60b952ab86
Merge branch 'master' into storageareas
2018-09-13 16:20:36 -04:00
0ec391354c
Merge branch 'fix_zms_from_mp4' into h265
2018-09-13 16:18:28 -04:00
b3ef347fd5
slight optimisations in frame skipping
2018-09-11 13:22:01 -04:00
c70fb2f195
When signal loss occurs, trigger an event close so that the event stops because we are no longer writing to the mp4
2018-09-10 17:11:16 -04:00
fe1e17d097
Capture can reasonably return -1 for EOF.
2018-09-05 11:16:17 -04:00
672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -04:00
53eae61883
Mostly spacing, but simplified logic removing assumption that local cameras give keyframes. They might not in future.
2018-08-17 16:05:02 -04:00
4297d39df6
spacing, code style, remove useless debug logging
2018-08-11 18:49:48 -04:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
97a6a28182
You should just mkdir and handle EEXIST because stating first is a race condition
2018-08-10 11:14:41 -04:00
246070793b
Fix crash in zma dur to images array not being allocated when analysis_fps not being set
2018-07-31 13:36:03 -04:00
908f81c6ef
Add some more debug
2018-07-31 13:22:52 -04:00
639717eb7b
If mysql gets restarted, and there is no change in fps, then the monitor_status record never gets updated. So just always update it.
2018-07-31 12:07:57 -04:00
61e7136857
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-07-12 17:03:21 -04:00
ea86cb1181
Add debugging line to try to figure out starttime in the future problem
2018-06-15 10:16:28 -04:00
39db8136b3
move pre_event_images init to constructor, getting rid of static_undef tests. Initialize timestamps to 0. Clean up some logic in Analyze
2018-05-26 13:01:30 -04:00
b7129578c1
fix case where pre_event_count=0 and analysis_fps is set because there are no pre_event_buffers
2018-05-24 10:59:15 -04:00
4454ca0072
Merge branch 'storageareas' into zma_to_thread
2018-05-20 10:39:14 -04:00
5df2fbfff2
fix logic to handle no pre_event frames
2018-05-15 15:53:25 -04:00
4ca77fdd69
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-05-15 12:44:36 -04:00
98b2a3f6f0
improve structure/spacing
2018-05-15 12:44:24 -04:00
da8a232f01
Merge branch 'storageareas' into zma_to_thread
2018-05-12 19:45:48 -04:00
d9fff848e7
change Groups to a vector, add GroupNames function
2018-05-12 14:37:26 -07:00
0a5980ce2e
Fix prealarmcount > alarm_frames. If Alarm frames is 1 and PreEventCount == 0, then the old line would have evaluated to true. By making it > alarm_count instead of >= alarm_count-1, we get the same behaviour for non-zero preevent counts, and also since alarm_frames >= 1 always, we handle the preeventcount=0 case.
2018-05-11 12:18:24 -04:00
94377a4652
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:57:50 -04:00
f6139d33ed
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:25:11 -04:00
1cd7b73114
turn off closing event in a separate thread, add Groups
2018-05-02 12:20:01 -07:00
d46c06d201
remove extra event=NULL and spaces
2018-05-01 12:19:46 -04:00
a4da624f4c
break out of loops when zm-terminate is set
2018-04-27 13:20:38 -07:00
8a80cf686b
Merge branch 'master' into storageareas
2018-04-26 21:58:34 -04:00
184596ed4b
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-25 04:29:35 -04:00
20f6985dff
implement capturing bandwidth
2018-04-24 14:11:27 -04:00
678503b992
fix ftbs on el7
2018-04-24 12:16:19 -05:00
cc525b2397
Output more detailed shared mem size info
2018-04-24 11:41:54 -04:00
5f7d404a0c
spacing & style. Put locking around db accesses in RealoadLinkedMonitors
2018-04-23 16:24:15 -04:00
56186a42ef
change signal_check_points to a per-monitor variable instead of parts of config. Only call SignalCheck if signal_check_points is > 0
2018-04-19 10:10:14 -04:00
eb21a5113e
Add a debug line in SignaCheck function
2018-04-19 09:34:14 -04:00
fd1c69d48a
switch to uint64_t for event_id because long long can actually be 128 bit
2018-04-17 13:51:20 -04:00
3b0282f6ec
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-17 12:32:10 -04:00
0198ac832d
improve logging around loss of signal and lock around static sql
2018-04-17 12:30:58 -04:00
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
73239a0dba
If no progress in analysis, bail
2018-04-14 17:03:45 -04:00
c7deb91319
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2018-04-14 14:58:25 -04:00
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
f9f78e9aa3
Convert event_id to a 64bit unsigned int
2018-04-12 13:40:11 -07:00
8518278476
coverity scan fixes/cleanups
2018-04-12 11:29:35 -04:00
c766c1ddd1
spacing cleanup
2018-04-12 10:28:22 -04:00
71d5984eb0
delete stream after use
2018-04-12 10:26:18 -04:00
64cfb39043
do an initial fps report early on
2018-04-06 23:21:22 +02:00
ec5f955d26
more db locking
2018-04-05 11:30:14 -04:00
dfc35721f9
ensure that sections are always > section_length
2018-04-03 07:03:12 -07:00
a5b77a59d3
allow 0 pre_event_count
2018-03-29 12:35:03 -04:00
b22911f554
wait to closeEvent on monitor shutdown
2018-03-28 14:03:56 -04:00
b8a792cfb7
whitespace google code style
2018-03-27 11:04:40 -04:00
bcc7011871
update sql loading code in Reload, which will automatically do the db locking
2018-03-27 10:04:19 -04:00
11cf3ce482
whitespace
2018-03-22 11:33:24 -04:00
e8e310b156
Merge branch 'storageareas' into zma_to_thread
2018-03-15 11:45:32 -04:00
ea38f7cca4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-15 11:43:15 -04:00
e523067df7
Merge branch 'storageareas' into zma_to_thread
2018-03-15 11:28:14 -04:00
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
6f3d16fe10
label_format can be null
2018-03-13 12:06:03 -07:00
cefd00d1ea
load User and Pass as well
2018-03-13 14:50:41 -04:00
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
5ca7871510
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2018-03-10 10:12:22 -05:00
2291816f4e
fix memleak
2018-03-10 10:12:12 -05:00
a419906361
Merge branch 'storageareas' into zma_to_thread
2018-03-09 09:03:19 -05:00
7fb1c8921b
reorder functions to put them in a better order
2018-03-09 07:50:47 -05:00
dcf7c4fdde
rework loading Monitor using consistent db query
2018-03-09 07:23:40 -05:00
80127cbf81
Merge branch 'storageareas' into zma_to_thread
2018-03-06 10:57:49 -05:00
03d3f5e665
Merge branch 'storageareas' into zma_to_thread
2018-03-03 13:28:01 -08:00
91c9714e43
cleanup
2018-03-02 18:26:21 -08:00
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
c443168389
split out codec and encoder, allowing one to specify which encoder to use
2018-02-28 07:17:16 -08:00
f00983b450
Don't setup snap and timestamp if it's an audio packet
2018-02-27 20:19:39 -05:00
3586825c90
fix preevent_count==0 causing div/0
2018-02-26 17:08:05 -08:00
e3802954f7
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-02-23 19:01:46 -05:00
a231f500ec
better debug, whitespace
2018-02-23 19:01:42 -05:00
ee1eef50cb
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2018-02-18 11:00:55 -05:00
d514e95606
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2018-02-17 12:26:08 -05:00
ec7f2e48d0
add back AnalysisFPS reporting and move the gettimeofday in after it is actually needed
2018-02-17 10:54:53 -05:00
84b7e85259
Add a mutex around mysql operations
2018-02-15 15:54:13 -05:00
9fd2b6be52
fix fps reporting
2018-02-15 14:07:55 -05:00
b5e0745ac7
Merge branch 'storageareas' into zma_to_thread
2018-02-14 13:56:03 -05:00
657fda818b
code docs
2018-02-13 05:26:30 -05:00
cd606dbab8
whitespace
2018-02-07 08:03:01 -05:00
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
a4c956da7d
Only update db entry when value changes
2018-02-05 22:59:22 -05:00
e25af4b40c
cleanup, reset result
2018-02-02 16:07:13 -05:00
Isaac Connor
Isaac Connor
Mitch Capper
Pliable Pixels
Isaac Connor
Isaac Connor
Andy Bauer
Isaac
Isaac Connor