Isaac Connor
aab717bc91
Add early test for zm_terminate after processing comms
2022-04-28 16:45:54 -04:00
Isaac Connor
dc055fb240
Remove code handling failure to setStreamStart. This is now ok and handled in runStream
2022-04-28 16:44:39 -04:00
Isaac Connor
ee6dff8cd4
Disconnect and Reconnect in PrimeCapture instead of in constructor and descructor. Fixes camera not reconnecting.
2022-04-28 16:43:45 -04:00
Isaac Connor
9935e4011c
Remove check for pktQueue.size(). We know that there are packets in it
2022-04-28 16:43:31 -04:00
Isaac Connor
554217931c
Remove debugging
2022-04-28 16:43:13 -04:00
Isaac Connor
f72c85b110
Redo the body of event::Run() so that we don't hold the lock while actually processing the packets. Only around queue manipulation. Should free up analysis thread.
2022-04-28 16:42:54 -04:00
Isaac Connor
45b6c97cc8
Don't exit if we fail to set stream start
2022-04-28 16:42:35 -04:00
Isaac Connor
063f27e5f7
Debug log when failed sending
2022-04-28 16:42:16 -04:00
Isaac Connor
a80a8532f9
Use notify_all instead of notify_one. If the analysis thread wakes up first, can then wait on packet and decoder won't wake up until next capture
2022-04-28 16:41:51 -04:00
Isaac Connor
133500fc7a
Add a notify_all before waiting in case decoder is waiting in packetqueue
2022-04-28 16:41:36 -04:00
Isaac Connor
eeb69cbb54
Move the tests for monitor connectedness down into the main while loop so that we also check for feof etc. The gist is to stay running even if monitor is not running. We will wait for it to come back
2022-04-28 16:41:11 -04:00
Isaac Connor
ce944b9a61
Add case to handle scale value stored in cooke == auto
2022-04-28 16:33:38 -04:00
Isaac Connor
a0a7c5c5a5
INF logging of alarm frames in alert state should be debug
2022-04-28 16:18:37 -04:00
Isaac Connor
f8d14b5fa7
New styles for new layout. Image and Points in in 1 div now, floated left, settings floated right.
2022-04-28 16:14:06 -04:00
Isaac Connor
c468be7c40
New styles for new layout. Image and Points in in 1 div now, floated left, settings floated right.
2022-04-28 16:13:51 -04:00
Isaac Connor
ba195203a6
var => const. Fix points not being draggable after switch to MonitorStream.js generated html. Fix hightlightoff not firing over points table
2022-04-28 16:10:46 -04:00
Isaac Connor
84ae91fe24
Comment out width and height setting on the imageFrame
2022-04-28 15:45:35 -04:00
Isaac Connor
1df601c20d
Don't set flags |= AVFMT_TS_NONSTRICT because we can't in ffmpeg5
2022-04-28 15:40:54 -04:00
Isaac Connor
9a91296a29
Merge from debian patch 0001-Adapt-apache2.conf-to-work-out-of-the-box.patch
2022-04-28 10:36:06 -04:00
Isaac Connor
6f2b5f785d
Code comment reminding us that packets in the event queue are locked.
2022-04-28 10:36:06 -04:00
Isaac Connor
7d9525e28b
WARNING should be a DEBUG when restarting a process
2022-04-28 10:36:06 -04:00
Isaac Connor
a092ca90eb
Fix logging of next_dts instead of last_dts
2022-04-28 10:36:06 -04:00
Isaac Connor
dbe8981378
Reduce warnings by setting has_warned = false in the correct spot. Add code comments
2022-04-28 10:36:06 -04:00
Isaac Connor
6f967f7a0b
Simplify openEvent. Move packetqeue clearing below event closing as packets might be in use
2022-04-28 10:36:06 -04:00
Isaac Connor
6c17bc36bc
Add check for deleting or terminating. Decrement packet counts in clear so that debugging makes more sense
2022-04-28 10:36:06 -04:00
Isaac Connor
00c2c2e794
replace No Data with No event. People get confused by No Data.
2022-04-28 10:36:06 -04:00
Isaac Connor
2a7217ec0d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-04-27 15:55:12 -04:00
Isaac Connor
6c4db6b087
Merge pull request #3471 from jp-bennett/patch-1
...
Change case of rtsp:// URI to match RFC
2022-04-25 14:44:02 -04:00
Jonathan Bennett
ad3d593b1f
Change case of rtsp:// URI to match RFC
...
At least one camera fails when receiving a DESCRIBE with the rtsp:// URI capitalized. The RFC uses lowercase, so this should be the more universal option.
2022-04-25 13:36:43 -05:00
Isaac Connor
3ecffcb007
Initialize ret to suppress warning.
2022-04-25 10:07:57 -04:00
Isaac Connor
390e93ccef
Merge pull request #3469 from anon8675309/automated_debian_build
...
Automated debian build
2022-04-25 09:11:16 -04:00
Isaac Connor
f18bc66103
Merge pull request #3470 from anon8675309/bullseye_install_docs
...
Improve installation instructions for Debian 11 (bullseye) #3467
2022-04-25 08:53:17 -04:00
anon8675309
7edbff038f
Update debian.rst
...
Improve installation instructions for Debian 11 (bullseye) #3467
2022-04-24 22:49:38 -05:00
anon8675309
3236a50d9f
Improve installation instructions for Debian 11 (bullseye) #3467
2022-04-24 21:16:41 -05:00
anon8675309
56a371e39e
Bumped up the timeout due to build server being slow sometimes
2022-04-24 13:36:05 -05:00
anon8675309
28b3ec1988
Fixed Ubuntu CI job, added debian build
2022-04-24 01:56:45 -05:00
Isaac Connor
0cb15d3418
Remove extra { breaking ptz
2022-04-23 19:29:04 -04:00
Isaac Connor
c15d2ac660
Use mOptions instead of Options(). Check for empty before parsing
2022-04-23 19:12:30 -04:00
Isaac Connor
857936d392
Merge pull request #3468 from teachernightowl/3467-update-debian11-install-docs
...
Added missing steps to Debian 11 installion docs
2022-04-23 18:56:45 -04:00
Uve M Steinmann
a332bbbbc9
Added missing steps to Debian 11 installion docs
2022-04-22 21:55:07 -03:00
Isaac Connor
13b0cdccbd
Use getStreamHTML to include the state and zones html
2022-04-22 16:00:50 -04:00
Isaac Connor
b15b0281be
Use getStreamHTML to include the state html
2022-04-22 16:00:27 -04:00
Isaac Connor
8d89639e2f
Include the padding when figureing the scaling
2022-04-22 15:59:58 -04:00
Isaac Connor
a5bb2535d8
Include the padding when figureing the scaling
2022-04-22 15:59:54 -04:00
Isaac Connor
d584b8ec21
Remove CMD_ defines because they are now in skin.js.php
2022-04-22 15:54:33 -04:00
Isaac Connor
44ace76e2e
Remove CMD_ defines because they are now in skin.js.php
2022-04-22 15:54:19 -04:00
Isaac Connor
003b23f171
Set img to 100% so it fills the frame
2022-04-22 15:53:27 -04:00
Isaac Connor
647bd69fc8
Move CMD_ defines to skin.js.php so that they are available everywhere
2022-04-22 15:52:34 -04:00
Isaac Connor
e47d1bcd07
Set imageFrame.monitor to 100%, don't float the .monitor and be more specific about styles for zonePoints so they don't affect other divs
2022-04-22 15:52:08 -04:00
Isaac Connor
2fb44769b6
split setScale into setStreamScale so we can set the img.src without altering the frame
2022-04-22 15:50:55 -04:00
