Isaac Connor
|
83683a5f8c
|
Always free alarm_image.HoldBuffer. Fixes crashes in rtsp_server. Remove some debug
|
2022-06-17 10:36:49 -04:00 |
|
Isaac Connor
|
ed4704438b
|
Handle zmTerminate in ReadRun. Fixes crash on termination of zm_rtsp_server
|
2022-06-17 10:36:35 -04:00 |
|
Isaac Connor
|
0da5403a3c
|
rework queuing to just have a depth of 10. Finish replacing AvPacket opkt with AVPacket *opkt
|
2022-06-17 10:34:59 -04:00 |
|
Isaac Connor
|
5fea76ee07
|
Handle zmTerminate in ReadRun. Fixes crash on termination of zm_rtsp_server
|
2022-06-17 10:34:03 -04:00 |
|
Isaac Connor
|
f41c5994be
|
Always free alarm_image.HoldBuffer. Fixes crashes in rtsp_server. Remove some debug
|
2022-06-17 10:33:09 -04:00 |
|
Isaac Connor
|
c2e91529ef
|
make reorder_queues a map. Move it to writePacket. Update code for opkt..
|
2022-06-16 18:29:23 -04:00 |
|
Isaac Connor
|
b55fbe3ff6
|
Merge branch 'master' into reorder_queue
|
2022-06-16 14:24:12 -04:00 |
|
Isaac Connor
|
e2dc70d286
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-06-16 14:12:34 -04:00 |
|
Isaac Connor
|
4a6ef4e628
|
Reduce logging in clearPackets
|
2022-06-16 14:11:36 -04:00 |
|
Isaac Connor
|
4ab58f5f22
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-06-16 09:58:49 -04:00 |
|
Isaac Connor
|
58fedd8c35
|
Fix streamQuery => streamCmdQuery. Fixes #3507
|
2022-06-16 09:58:26 -04:00 |
|
Isaac Connor
|
f4339b0e9e
|
fix eslint
|
2022-06-15 13:19:53 -04:00 |
|
Isaac Connor
|
17562671c1
|
fix eslint
|
2022-06-15 13:18:11 -04:00 |
|
Isaac Connor
|
f728cb15bc
|
fix eslint
|
2022-06-15 13:17:01 -04:00 |
|
Isaac Connor
|
29d8441227
|
Fix janus stream not working on zones and zone views
|
2022-06-15 13:09:27 -04:00 |
|
Isaac Connor
|
4d81e3c7f8
|
Make video tags 100% as well as img and svg
|
2022-06-15 13:09:11 -04:00 |
|
Isaac Connor
|
2141a5dd1c
|
Don't include 0 width in janus video tag
|
2022-06-15 13:08:48 -04:00 |
|
Isaac Connor
|
a5cbe65d70
|
watchdog is not available everywhere yet. comment out its use
|
2022-06-15 13:08:38 -04:00 |
|
Isaac Connor
|
cf88497c77
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-06-15 12:42:07 -04:00 |
|
Isaac Connor
|
598966c685
|
Bump version to 1.37.17 for db update adding AnalysisImage
|
2022-06-15 12:41:46 -04:00 |
|
Isaac Connor
|
5188346086
|
Institute a status timer to be used when not streaming from zms.
|
2022-06-15 12:34:55 -04:00 |
|
Isaac Connor
|
223a46393e
|
Add AnalysisImage to Monitor
|
2022-06-15 11:34:20 -04:00 |
|
Isaac Connor
|
a2b4e39ddc
|
replace USE_Y_CHANNEL with monitor::analysis_image setting.
|
2022-06-15 11:33:44 -04:00 |
|
Isaac Connor
|
9211e72b94
|
Add AnalysisImage and options to MOnitor view
|
2022-06-15 11:33:09 -04:00 |
|
Isaac Connor
|
fb92207bb1
|
Improve map. Invalidate size on location tab so that tiles populate. Update marker position when get Current Location button is clicked. Make marker draggable.
|
2022-06-15 11:28:54 -04:00 |
|
Isaac Connor
|
c189250a61
|
Add AnalysisImage and options to MOnitor object
|
2022-06-15 11:27:48 -04:00 |
|
Isaac Connor
|
4e39de0e00
|
Merge branch 'master' into reorder_queue
|
2022-06-13 18:20:01 -04:00 |
|
Isaac Connor
|
3299f5ed49
|
Handle php versions < 5.6.1 which don't have non-blocking semaphore support
|
2022-06-13 15:56:52 -04:00 |
|
Isaac Connor
|
a578370970
|
Add filter terms for snapshots
|
2022-06-09 12:13:58 -04:00 |
|
Isaac Connor
|
5344babfd7
|
Don't close on a -1
|
2022-06-08 23:30:51 -04:00 |
|
Isaac Connor
|
9f3e17558e
|
Clear zones on delete
|
2022-06-08 23:30:38 -04:00 |
|
Isaac Connor
|
f0a12a53d0
|
move loading and unloading of zones and linked monitors into connect/disconnect because sinze zones cache the monitor object, the destructor never gets called. Also merge Blending of ref_image to motion detection code to reduce redundant if's and remove one unnecessary blend
|
2022-06-08 23:30:09 -04:00 |
|
Isaac Connor
|
59577133ef
|
parenthesis
|
2022-06-08 23:28:54 -04:00 |
|
Isaac Connor
|
cecb8f65b7
|
Try out close_input instead of free_context
|
2022-06-08 23:27:51 -04:00 |
|
Isaac Connor
|
7748612391
|
Merge branch 'master' into linked_zones
|
2022-06-08 17:13:43 -04:00 |
|
Isaac Connor
|
0bc64ccebe
|
split up long lines to appease debbuild
|
2022-06-08 17:10:23 -04:00 |
|
Isaac Connor
|
11337eb2d3
|
Don't call Terminate if we aren't connected. Spacing
|
2022-06-08 16:46:16 -04:00 |
|
Isaac Connor
|
ac763ac7f9
|
Fix a poorly worded debug
|
2022-06-08 16:45:56 -04:00 |
|
Isaac Connor
|
1b107b2e02
|
Must memset the new allocation or we can use an unitialized value from the buffer
|
2022-06-08 16:45:13 -04:00 |
|
Isaac Connor
|
1531ced590
|
Remove unneeded debug
|
2022-06-08 16:44:47 -04:00 |
|
Isaac Connor
|
710b577223
|
initialize zone
|
2022-06-08 12:12:59 -04:00 |
|
Isaac Connor
|
9093a8694b
|
Fix crashes. Zones should use const for monitor object and not references.
|
2022-06-07 20:52:39 -04:00 |
|
Isaac Connor
|
a60aff0d9d
|
Add checking of zone_scores
|
2022-06-07 20:52:13 -04:00 |
|
Isaac Connor
|
98ef850b5e
|
Only parse and load LinkedMonitors if doing Capture.
|
2022-06-07 20:51:58 -04:00 |
|
Isaac Connor
|
07e32025df
|
Just store the linked_monitors string instead of parsing and loading of related objects. Only call ReloadLinkedMonitors if doing analysis. Convert zone id's to unsigned
|
2022-06-07 18:36:25 -04:00 |
|
Isaac Connor
|
e86dd7eb32
|
move curl init and cleanup into zmc
|
2022-06-07 18:19:00 -04:00 |
|
Isaac Connor
|
e6659560a4
|
need to use shared_from_this() instead of this now
|
2022-06-07 18:18:47 -04:00 |
|
Isaac Connor
|
78a87517f6
|
convert to taking a std::shared_ptr<Monitor> instead of a Monitor *. Implement Name() which just returns the std::string label.
|
2022-06-07 18:18:24 -04:00 |
|
Isaac Connor
|
dd1d194ec7
|
Generate name based on presence of zone. Add loading of zones and figuring out which one is ours.
|
2022-06-07 18:16:23 -04:00 |
|
Isaac Connor
|
fb48c5f01c
|
Add public std::enable_shared_from_this so that we can generate a std::shared_ptr<Monitor> from this when setting up zones and LinkedMonitors. Convert LinkedMonitor to stores objects instead of ids and convert name to a std::string
|
2022-06-07 18:15:51 -04:00 |