Isaac Connor
|
701045393c
|
fix typo
|
2022-01-10 09:07:59 -05:00 |
|
Isaac Connor
|
e9db12ca94
|
Fix importance got cutnpasted to where it shouldn't be
|
2022-01-09 14:46:48 -05:00 |
|
Isaac Connor
|
21762585d9
|
rework getting second packet for de-interlace. Pass notesetmap by reference
|
2022-01-09 14:43:23 -05:00 |
|
Isaac Connor
|
1f6874dd53
|
add explicit
|
2022-01-09 14:43:23 -05:00 |
|
Isaac Connor
|
f0c6413dc8
|
solve ccpcheck complaints
|
2022-01-09 14:43:23 -05:00 |
|
Isaac Connor
|
c832fabafd
|
solve ccpcheck complaints
|
2022-01-09 14:43:23 -05:00 |
|
Isaac Connor
|
af8964c043
|
Merge pull request #3406 from jp-bennett/master
Continued work on ONVIF
|
2022-01-08 15:19:51 -05:00 |
Jonathan Bennett
|
52b377ca86
|
Adds the 'closes_event" ONVIF option, to handle motionDetection message quirks.
|
2022-01-08 14:05:57 -06:00 |
|
Jonathan Bennett
|
a3c298ca93
|
Add nullptr checks to prevent a crash when in NODECT mode
|
2022-01-08 13:17:04 -06:00 |
Isaac Connor
|
a153798b47
|
fix init when no GSOAP
|
2022-01-08 12:37:23 -05:00 |
|
Isaac Connor
|
f01ecf2a16
|
Add libgsoap to dependencies
|
2022-01-08 12:37:05 -05:00 |
|
Isaac Connor
|
dc975daa7a
|
init soap to null in constructor. Stop analysis thread before destroying soap.
|
2022-01-08 12:21:29 -05:00 |
|
Isaac Connor
|
c8bc0661b1
|
Have to clear src before resetting or some browsers won't load the new image
|
2022-01-08 12:14:28 -05:00 |
|
Isaac Connor
|
36a493ad5e
|
bump to 1.37.7
|
2022-01-07 16:35:52 -05:00 |
|
Isaac Connor
|
a2a04edcf7
|
Only init gsoap if we are capturing
|
2022-01-07 16:31:45 -05:00 |
|
Isaac Connor
|
71ff1e3cea
|
Add translates for analyse button. Fixup styles
|
2022-01-07 16:30:14 -05:00 |
|
Isaac Connor
|
a679455a0b
|
Merge branch 'master' into merge_work_on_zms
|
2022-01-07 16:22:51 -05:00 |
|
Isaac Connor
|
deaff43f66
|
use let/const
|
2022-01-07 16:22:24 -05:00 |
|
Isaac Connor
|
8f372e6a6c
|
Add useful title to frame image telling us which we are looking at
|
2022-01-07 16:22:11 -05:00 |
|
Isaac Connor
|
cfac99be4e
|
better debugging when the row has no Id
|
2022-01-07 16:21:49 -05:00 |
|
Isaac Connor
|
79c45f50d5
|
define raw as an empty array so we don't generate js errors
|
2022-01-07 16:21:34 -05:00 |
|
Isaac Connor
|
038bff0df2
|
Add analyse button
|
2022-01-07 16:06:53 -05:00 |
|
Isaac Connor
|
1a3bee102f
|
analyze->analyse, fixup how we show enabled/disabled and start with analysis frame displayed
|
2022-01-07 16:06:38 -05:00 |
|
Isaac Connor
|
939f165b22
|
rename analyze to analyse
|
2022-01-07 16:05:52 -05:00 |
|
Isaac Connor
|
76fe20c69f
|
Only send analysis_frame if doing motion detection. Add debuging. Remove other debugging
|
2022-01-07 15:57:28 -05:00 |
|
Isaac Connor
|
f4c813a26f
|
Assign image to analysis_image before doing motion detection so there is always an image to see. Fix crash.
|
2022-01-07 15:57:01 -05:00 |
|
Isaac Connor
|
7219809364
|
Add CMD_ANALYZE_ON/OFF
|
2022-01-07 14:00:36 -05:00 |
|
Isaac Connor
|
c914f00126
|
browser doesn't seem to like step=0.01
add analyze_frames button handling and update to jquery instead of mootools styles
|
2022-01-07 13:59:45 -05:00 |
|
Isaac Connor
|
6f5eee6c0f
|
Add show_analyze_frames function to tell zms to send analysis frames
|
2022-01-07 13:53:49 -05:00 |
|
Isaac Connor
|
df0a0c7853
|
Add CMD_ANALYZE_ON and OFF
|
2022-01-07 13:50:40 -05:00 |
|
Isaac Connor
|
24bb43bbeb
|
finish merge. Assign the alarm image to the shmem
|
2022-01-07 13:16:51 -05:00 |
|
Isaac Connor
|
58858d2d25
|
Include alarm_image in shared_mem
|
2022-01-07 13:12:44 -05:00 |
|
Isaac Connor
|
7ae9bebea4
|
Add analysis boolean query param
|
2022-01-07 12:40:21 -05:00 |
|
Isaac Connor
|
8863fc0e0f
|
Add FrameType to StreamBase so we can sends analysis frames
|
2022-01-07 12:32:31 -05:00 |
|
Isaac Connor
|
16964cf327
|
fix zms running past end of event
|
2022-01-07 12:30:56 -05:00 |
|
Isaac Connor
|
657fc5cad5
|
convert function to relevant capturing/analysing
|
2022-01-07 11:52:19 -05:00 |
|
Isaac Connor
|
2ba0757fca
|
Remove references to function, add Capturing_Strings, Analysing_Strings, Recording_Strings.
|
2022-01-07 11:51:43 -05:00 |
|
Isaac Connor
|
5840602b6e
|
Merge pull request #3404 from jp-bennett/master
Adds ONVIF motion Detection
|
2022-01-07 10:35:32 -05:00 |
|
Isaac Connor
|
6d3c6330df
|
Fix freebsd build by fixing incorrect use of SystemTimePoint when we want TimePoint
|
2022-01-07 10:34:44 -05:00 |
|
Jonathan Bennett
|
1333d8c751
|
Adds ONVIF Motion Detection Support
|
2022-01-06 16:45:15 -06:00 |
|
Isaac Connor
|
c5ae080746
|
further replace function with recording/analysing. One result of this is we can be in ALERT/ALARM status without recording.
|
2022-01-05 21:26:46 -05:00 |
|
Isaac Connor
|
dadf53f99d
|
Merge branch 'master' into multistream
|
2022-01-05 20:20:45 -05:00 |
|
Isaac Connor
|
738c252948
|
load onvif settings and provide accessors
|
2022-01-05 20:15:39 -05:00 |
|
Isaac Connor
|
f7c90f5c41
|
Replace some function with recording == and analysis==
|
2022-01-05 19:53:30 -05:00 |
|
Isaac Connor
|
99900e8c1d
|
Merge branch 'master' into multistream
|
2022-01-05 18:04:10 -05:00 |
|
Isaac Connor
|
aefed4e174
|
Merge branch 'master' into multistream
|
2022-01-05 18:03:44 -05:00 |
|
Isaac Connor
|
bc67493f91
|
Alter log level of restart events based on Importance setting
|
2022-01-05 16:49:20 -05:00 |
|
Isaac Connor
|
bfac696fb7
|
return logger from loginit so that we can use it
|
2022-01-05 16:49:00 -05:00 |
|
Isaac Connor
|
cce24ea427
|
Add RTSPServer and Importance fields
|
2022-01-05 16:48:46 -05:00 |
|
Isaac Connor
|
198ee73d0e
|
Add alarm_cause to zm_packet. Clean up code dealing with decoding not being ready
|
2022-01-04 17:38:25 -05:00 |