Isaac Connor
7923e0c279
fix min_section_length not being honoured
2021-01-27 18:13:16 -05:00
Isaac Connor
1ca93c4211
accept packets with image as video
2021-01-27 12:49:54 -05:00
Isaac Connor
4dcce4ac95
Merge branch 'rtsp_server'
2021-01-26 14:22:10 -05:00
Isaac Connor
e4831909d6
get_packet can return null if we are terminating
2021-01-26 12:22:26 -05:00
Isaac Connor
f1686cfe9a
When not capturing don't try to create mmap. Fixes #3112
2021-01-22 12:11:43 -05:00
Isaac Connor
66c78e5a9b
Merge branch 'zma_to_thread' into rtsp_server
2021-01-19 13:43:25 -05:00
Isaac Connor
256080abb1
Fix crash of Reload() due to Load() clearing shared_data and mem_ptr. Load() shouldn't do these kinds of initialisations.
2021-01-19 09:44:53 -05:00
Isaac Connor
68b0f7e1b5
initialize packetqueue, analysis_it, storage and videostore in Monitor constructor initializer. Only delete packetqeuue if it has been created.
2021-01-15 14:42:26 -05:00
Isaac Connor
10e56df53c
analysis_limit > cpature fps: only log a warning if we have actually been capturing for a while. If doing passthrough, need to start continuous event from last keyframe
2021-01-15 11:54:36 -05:00
Isaac Connor
164a0f5a44
Need to use get_packet so that packets getting written to event are locked. Because queuePacket might delete them.
2021-01-12 14:11:47 -05:00
Isaac Connor
e8d06f702c
Handle signal loss, improve debugging
2021-01-11 13:46:50 -05:00
Isaac Connor
46a8bb22fb
get camera if we havn't already. Don't delete the timestamp in shared zmpackets because it is just a pointer to shmem. Set it to null instead so that ~ZMpacket doesn't try to free it
2021-01-11 13:46:50 -05:00
Isaac Connor
65fc5bf478
move code from Load for purpose==ANALYSIS because it will never run. Analysis is a thread now and must assume that PrimeCapture has already succeeded.
2021-01-11 13:46:50 -05:00
Isaac Connor
da7a50c92d
Rename H264PASSTHROUGH to just PASSTHROUGH. Start with last_signal set to true so that we don't have a signal change event on startup. Use new generic packetqueue functions
2021-01-11 13:46:50 -05:00
Isaac Connor
e1f6f5984d
Handle signal loss, improve debugging
2021-01-11 13:35:48 -05:00
Isaac Connor
a6aefcf477
get camera if we havn't already. Don't delete the timestamp in shared zmpackets because it is just a pointer to shmem. Set it to null instead so that ~ZMpacket doesn't try to free it
2021-01-08 15:49:09 -05:00
Isaac Connor
ff3bc981de
move code from Load for purpose==ANALYSIS because it will never run. Analysis is a thread now and must assume that PrimeCapture has already succeeded.
2021-01-07 09:40:24 -05:00
Isaac Connor
e93a895f28
Rename H264PASSTHROUGH to just PASSTHROUGH. Start with last_signal set to true so that we don't have a signal change event on startup. Use new generic packetqueue functions
2021-01-06 11:31:31 -05:00
Isaac Connor
f61210c91f
remove old code using image_buffer in zm_packets
2020-12-30 21:23:29 -05:00
Isaac Connor
284b9f963f
Merge branch 'master' into zma_to_thread
2020-12-29 12:18:26 -05:00
Isaac Connor
197f9bdd9e
indenting fix. Don't update reference image if not doing motion detection. Decouple the image buffer from the packetqueue. So always allocate a new image. Then copy decoded image to image buffer if required.
2020-12-27 12:00:18 -05:00
Isaac Connor
ddf66bc9b5
Merge pull request #3100 from vertigeaux/share_frame_scores
...
save frame scores to SharedData for use with linked monitors
2020-12-24 11:08:25 -05:00
Isaac Connor
1ffc233593
Move some initialisation into MOnitor() initialisation. Update UpdateAnalysisFPS to use more doubles instead of integers to get better numbers. Move capture FPS updating to UpdateCaptureFPS and use doubles there too. remove some dead code and add some debugging
2020-12-23 18:50:07 -05:00
Isaac Connor
fb2793d337
use nullptr instead of 0 when init'ing event
2020-12-23 09:11:33 -05:00
Isaac Connor
a1917d83d0
Merge branch 'master' into zma_to_thread
2020-12-22 19:52:09 -05:00
Vertigeaux
1416cbb03c
save frame scores to SharedData for use with linked monitors
2020-12-22 17:44:53 -06:00
Isaac Connor
d6486d1a7e
use nullptr instead of 0 when init'ing event
2020-12-22 15:44:07 -05:00
Isaac Connor
4bea286cfe
Use new get_event_start_packet_it function to start the new event with the right packet.
2020-12-22 10:22:28 -05:00
Isaac Connor
bc03afa166
Merge branch 'rtsp_server' into zma_to_thread
2020-12-17 10:21:51 -05:00
Isaac Connor
8d52baeee2
Merge branch 'master' into rtsp_server
...
Cleanup Analysis a bit. We can't skip packets just because they are audio. Clean up the state machine transitions a bit to make them a little more readable.
Change logic of PrimeCapture, success MUST return 1. 0 means no error but also no success.
Debugging and braces improvements in local_camera.
2020-12-17 10:16:54 -05:00
Isaac Connor
08d82fb86a
use nullptr instead of 0 when init'ing event
2020-12-15 18:25:17 -05:00
Isaac Connor
da18305729
Remove some dead code and debugging
2020-12-15 15:59:46 -05:00
Isaac Connor
0702b64cc4
Merge branch 'master' into zma_to_thread
2020-12-15 10:51:40 -05:00
Isaac Connor
99e7ae3505
Merge branch 'master' into rtsp_server
2020-12-15 10:14:19 -05:00
Isaac Connor
97b0ea2b73
Add missing columns to sql to load monitors. Add code to do DecodeEnabled. Handle audio packets
2020-12-12 18:52:57 -05:00
Isaac Connor
f77292e6cc
Move the decoding_enabled logic to constructor to save a few cycles
2020-12-10 16:23:08 -05:00
Isaac Connor
7f72d5399f
add decoding_enabled and DecodingEnabled function
2020-12-10 14:05:46 -05:00
Isaac Connor
6bf5d1b5a1
Fixes to analysis_fps vs analysis_fps_limit. Fixes to logic in analysis. Make capture_fps and analysis_fps be part of shared mem.
2020-12-09 15:00:11 -05:00
Isaac Connor
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
Isaac Connor
36b5702c50
Increase LinkedMonitor debugging. Fix LinkedMonitors. Fixes #3091
2020-12-05 19:36:44 -05:00
Isaac Connor
4d33667a85
Merge branch 'release-1.34'
2020-12-05 16:51:42 -05:00
Bluemax
d8993931da
Improve group permissions (mode 660)
...
Make /dev/shm files 660.
2020-12-02 21:27:00 +01:00
Isaac Connor
03f033cf36
cleanup MOnitor destructor. Most of the freeing is done in disconnect now. Fixes zms crash
2020-11-19 16:39:14 -05:00
Isaac Connor
634a3dbe81
fix crashes/memleaks when waiting for a zmc process to start. Fix other memleaks
2020-11-19 10:43:02 -05:00
Isaac Connor
6542072334
fix logic causing segfault instead of waiting for zmc. Remove trailing whitespaces
2020-11-18 09:56:13 -05:00
Isaac Connor
d2a203014f
rename diagpipe-r so that we don't have to create directories in SOCKS_DIR
2020-11-13 17:05:03 -05:00
Isaac Connor
08a8155b47
Implement a Monitor::disconnect function. Fix Fatals during connect and cleanup Analysis Monitor code to wait around for zmc. Handle zmc going away gracefully. Fixes a slow zma startup due to zmc not being setup yet.
2020-11-13 12:27:51 -05:00
Isaac Connor
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
Isaac Connor
de74a15ab1
Move diag_fifo pipes in SOCKS_DIR instead of assigned Storage area. Storage areas could be a fs that cannot handle sockets or fifos like NFS.
2020-11-12 11:53:51 -05:00
Isaac Connor
f91dcc9b60
declar rc as int
2020-11-11 20:05:47 -05:00
