mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-19 22:37:36 -04:00
Code Issues Packages Projects Releases Wiki Activity
17,631 Commits 80 Branches 104 Tags
27011ab49bedb8862bbd2618d05939845722cd2f
Commit Graph

163 Commits

Author SHA1 Message Date
Isaac Connor
bfaed28cff use config.min_rtsp_port to determine if we start up the rtsp server. Move the sleep on failure to capture down below shutting everything down. 2021-01-26 14:20:03 -05:00
Isaac Connor
8a1686076a break long line 2021-01-22 20:24:29 -05:00
Isaac Connor
a30a473981 fix passing in audiostream 2021-01-21 10:27:15 -05:00
Isaac Connor
66c78e5a9b Merge branch 'zma_to_thread' into rtsp_server 2021-01-19 13:43:25 -05:00
Isaac Connor
649114ed39 further disable rtsp_server 2021-01-11 13:46:50 -05:00
Isaac Connor
497b91f7c6 disable rtsp_server 2021-01-11 13:46:50 -05:00
Isaac Connor
97dff2fb28 Open/CLose RTSP with analysis thread when opening and closing monitor. We have to have successfully PrimeCapture before adding streams to RTSP Server and need to shut it down when closing the monitor because the packetqueue goes away 2021-01-11 13:46:50 -05:00
Isaac Connor
2fe325efe7 further disable rtsp_server 2021-01-11 13:38:22 -05:00
Isaac Connor
81d6f8c1ee disable rtsp_server 2021-01-07 15:13:02 -05:00
Isaac Connor
595bb2f565 Open/CLose RTSP with analysis thread when opening and closing monitor. We have to have successfully PrimeCapture before adding streams to RTSP Server and need to shut it down when closing the monitor because the packetqueue goes away 2021-01-07 09:47:53 -05:00
Isaac Connor
c8d2eb9c0f Must stop threads before Closing monitor 2020-12-27 12:04:35 -05:00
Isaac Connor
400e0de609 When updating Monitor_Status, reset FPS on Prime 2020-12-22 10:22:52 -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
89eacbc8a8 NODECT needs an analysis thread to check for triggers and linked monitors. Turn off RTSP for now 2020-12-15 16:55:12 -05:00
Isaac Connor
99e7ae3505 Merge branch 'master' into rtsp_server 2020-12-15 10:14:19 -05:00
Isaac Connor
9d43b64d4a Add debug and rtsp_server 2020-12-09 15:03:00 -05:00
Isaac Connor
df783f4835 Merge branch 'master' into zma_to_thread 2020-11-12 12:53:55 -05:00
Isaac Connor
cda3824a25 Use INSERT.. ON DUPLICATE... instead of REPLACE INTO. REPLACE INTO deletes the existing row. Since we now have event counts in there, we lose them. 2020-11-10 12:33:10 -05:00
Isaac Connor
a39a656373 Merge branch 'master' into zma_to_thread 2020-09-29 11:02:40 -04:00
Peter Keresztes Schmidt
8f980a1168 Convert NULL/0 to nullptr 
The 0 -> nullptr changes should definitely improve readability.
 2020-08-26 22:03:40 +02:00
Isaac Connor
d23dc42981 fix merge from master, make it compile 2020-07-21 18:48:45 -04:00
Isaac Connor
869860bb26 Merge branch 'master' into zma_to_thread 2020-07-21 17:49:39 -04:00
Isaac Connor
c79c65e72e spacing fixes 2020-07-07 16:14:57 -04:00
Isaac Connor
4ff341a0f5 Merge branch 'master' into zma_to_thread 2020-05-02 18:03:42 -04:00
Isaac Connor
9525268192 Wait 5 seconds instead of 1 after failure to connect. Reduces error logs filling up db. 2020-01-13 12:52:34 -05:00
Isaac Connor
09fcbad666 Merge branch 'master' into zma_to_thread 2019-11-30 14:59:39 -05:00
Isaac Connor
09533c19af Fix %d to %s 2019-09-20 08:19:44 -04:00
Isaac Connor
0d347f0cf5 init log early so that we create zmc_m.log instead of undef.log 2019-09-17 11:37:48 -04:00
Isaac Connor
7b06f58559 Limit Connection error logs to every 10 minutes instead of every 10 seconds. Connection attempts still happen at 10 second intervals 2019-05-27 17:16:23 -04:00
Isaac Connor
96b7d30d7d Merge branch 'master' into zma_to_thread 2019-04-15 10:47:26 -04:00
Isaac Connor
a9e2011727 Merge branch 'storageareas' into zma_to_thread 2019-02-13 12:24:38 -05:00
Isaac Connor
78b97303a3 Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2019-02-13 11:32:40 -05:00
Isaac Connor
2563951c1f comment out the signal blocking. I still can't figure out why we would want it 2019-02-13 11:32:34 -05:00
Isaac Connor
1aad1f765d slep for 1 second if there is an error in capturing 2019-02-13 11:28:18 -05:00
Isaac Connor
5ab1126260 Merge branch 'storageareas' into zma_to_thread 2018-10-20 17:31:14 -04:00
Isaac Connor
fe1e17d097 Capture can reasonably return -1 for EOF. 2018-09-05 11:16:17 -04:00
Isaac Connor
db560a5540 Don't do delay calcs if delay is empty, result will always be negative 2018-08-17 16:06:30 -04:00
Isaac Connor
979b31ffc3 Merge branch 'storageareas' into zma_to_thread 2018-08-11 10:08:30 -04:00
Isaac Connor
8792190f75 use 0 for return code when exiting cleanly 2018-05-25 14:21:41 -04:00
Isaac Connor
4454ca0072 Merge branch 'storageareas' into zma_to_thread 2018-05-20 10:39:14 -04:00
Isaac Connor
d3c95ea144 fix merges 2018-05-12 19:44:20 -04:00
Isaac Connor
f6139d33ed Merge branch 'storageareas' into zma_to_thread 2018-05-05 12:25:11 -04:00
Isaac Connor
61fe2a734b Add SIGHUP handler so that zmc reloads instead of dies 2018-04-25 09:38:18 -04:00
Isaac Connor
3b9f7b38c5 Use int instead of long. Monitor->GetCaptureDelay returns an int, so no reason to use long. 2018-04-23 10:40:42 -04:00
Isaac Connor
609244857d google styleguide updates 2018-04-23 10:39:32 -04:00
Isaac Connor
9c0600cace Add a HUP Handler 2018-04-23 10:29:42 -04:00
Isaac Connor
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
Isaac Connor
cd3046abb3 Merge branch 'storageareas' into zma_to_thread 2018-04-14 11:03:08 -04:00
Isaac
06fed41d5a whitespace 2018-04-06 23:21:47 +02:00
Isaac Connor
b9da309904 remove spaces 2018-04-05 11:33:09 -04:00