Commit Graph

19473 Commits (e5b858a3c372eddc6ec51430e412ec27a8d2b3c1)

Author SHA1 Message Date
Isaac Connor 789816aead Stop the dbQueue before closing logs. Since dbQueue.stop() join's the dbQueue thread, it should not log after we return. 2022-05-18 17:27:26 -04:00
Isaac Connor e4c6e108ec Stop the dbQueue before closing logs. Since dbQueue.stop() join's the dbQueue thread, it should not log after we return. 2022-05-18 17:16:11 -04:00
Isaac Connor f8904fd3a2 Set last_write to now instead of packet timestamp. This is so that zmwatch doesn't kill us if we fall behind. Add a warning message about it though. 2022-05-18 17:06:54 -04:00
Isaac Connor 77ff70572a Use auto to get the right type for n_coords 2022-05-18 12:56:09 -04:00
Isaac Connor 675f431c82 Warn when the number of vertices changes due to clipping 2022-05-18 12:55:56 -04:00
Isaac Connor 46c0134fb3 Handle no vertices in Fill. Prevents crash when a zone is entirely outside the image 2022-05-18 12:55:47 -04:00
r01k 10e438e526 Fixed in export.php "Class 'Filter' not found" and construction of SQL query with wrong syntax 2022-05-13 09:29:09 -04:00
Isaac Connor a611f7cc22 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2022-05-12 16:15:34 -04:00
Isaac Connor 5bc01d75e5 Don't build for hirsute, do build for jammy 2022-05-12 16:14:49 -04:00
Isaac Connor f9b49002c4 We have to update start_usec not just start. Fixes #3439 2022-05-12 14:20:36 -04:00
Isaac Connor 945ff0df7d Fix inverted logic breaking audio 2022-05-12 12:56:40 -04:00
Isaac Connor bba851e8b5 Setting flags in ffmpeg5 crashes, so don't do it. 2022-05-12 12:07:13 -04:00
Isaac Connor 56e121e9bb Don't clear img.src after sending QUIT. QUIT will do the job and killing the stream first might mean that it gets lost 2022-05-12 12:05:02 -04:00
Isaac Connor 0d29864d36 Start the query status timer on img.load 2022-05-12 10:51:27 -04:00
Isaac Connor 6419ec6841 Make STATES const instead of VAR 2022-05-12 10:51:05 -04:00
Isaac Connor 76c8b78b5a Wake up everyone waiting in packetqueue before joining the event thread so that we don't lock 2022-05-12 10:50:28 -04:00
Isaac Connor 5a73e16bd2 Introduce packetqueue::stop which just sets the deleting flag and sends out a notify. The idea is to call it before clear(). 2022-05-12 10:50:04 -04:00
Isaac Connor 1af63e151b Fix numbering of states, since UNKNOWN=0 2022-05-12 10:17:02 -04:00
Isaac Connor 6952a324bd const_cast away the constness of oformat so that we can set AV_TS_NOTSTRICT 2022-05-12 10:06:15 -04:00
Isaac Connor d1dbd8639b Use AV_NOPTS_VALUE instead of 0 in first_dts/first_pts variables. Don't adjust dts when it's AV_NOPTS_VALUE in writeVideoPacket. Handle it better in writePacket. 2022-05-12 10:06:08 -04:00
Isaac Connor ccf48a4c02 Add more debugging of packet processing 2022-05-11 18:42:29 -04:00
Isaac Connor 7f9a9e5c22 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2022-05-11 10:22:04 -04:00
Isaac Connor 7545cbea4d Don't assuming we want to communicate with zms if streaming. 2022-05-11 10:22:01 -04:00
Isaac Connor 30384ae8f9 Convert width and height auto => 0 to auto=>auto. Add an auto-select for 5 wide when there are more than 5 and a multiple of 5 2022-05-10 18:35:13 -04:00
Isaac Connor bfb6d79615 Convert width and height auto => 0 to auto=>auto. Set image height in setLayout so that we aren't left with a specified height on the image 2022-05-10 18:34:38 -04:00
Isaac Connor 8a1905cb4b Remove duplicated code in else 2022-05-10 18:01:28 -04:00
Isaac Connor 0d6f6fa1b8 State::Unknown must be 0 so that we can index into the strings array 2022-05-10 18:00:01 -04:00
Isaac Connor f5567bc9a7 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2022-05-10 17:48:35 -04:00
Isaac Connor 51ffc05c4d Set samesite for session ZMSESSID cookie for php < 7.3 2022-05-10 17:48:16 -04:00
Isaac Connor bc8677e333 Add debugging to help figure out misordered of packets on event creation 2022-05-10 17:34:56 -04:00
Isaac Connor ad4d38b7cf Add libswresample2 and libswscale4 for bionic support 2022-05-08 12:40:40 -04:00
Isaac Connor 072677a1be Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2022-05-05 13:30:00 -04:00
Isaac Connor 58a97c2736 downgrade to debhelper 11 2022-05-05 13:29:33 -04:00
Isaac Connor 45ef6e2e1f Shorten the time we hold the event lock when closing the event 2022-05-05 09:06:29 -04:00
Isaac Connor e2d26f98f8 Fix logic when to exit 2022-05-04 17:03:26 -04:00
Isaac Connor e6ce991210 Can't break out early or we don't clear packetqueue 2022-05-04 16:51:31 -04:00
Isaac Connor 1a472ea923 Bump version to 1.36.15 for release 2022-05-04 15:40:24 -04:00
Isaac Connor 45f37ebf26 Improve error message when sws_scale fails 2022-05-04 10:00:51 -04:00
Isaac Connor 0e92eace25 Remove timeout on ajax call to generate the zip. Fixes #3264 2022-05-03 13:20:38 -04:00
Isaac Connor d62ea5a5f7 Comment out debugging 2022-05-02 10:25:49 -04:00
Isaac Connor fa29765d9b put back 1.36.14 we aren't ready to release yet 2022-05-02 10:16:18 -04:00
Isaac Connor d664d17813 Fix lockup on logrot by not releasing the event lock 2022-05-02 09:56:11 -04:00
Isaac Connor fe15af69fe Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2022-04-30 13:44:26 -04:00
Isaac Connor 4f433fa623 Fix a case where packets could be left in queue on delete 2022-04-30 13:41:58 -04:00
tftadmin Appleton 477c125bb9 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2022-04-29 09:24:19 -05:00
tftadmin Appleton cc95d5963c remove y-channel image code. It stays in master for now 2022-04-29 09:24:12 -05:00
Isaac Connor 51f7ea2d8b Fix lockup due to not checking for terminate_ before grabbing the lock again 2022-04-29 10:22:55 -04:00
Isaac Connor 6938448426 Bump version to 1.36.15 2022-04-28 17:12:13 -04:00
Isaac Connor c572df48ed Fix points not unhighlighting onmouseout 2022-04-28 16:08:25 -04:00
Isaac Connor 0fa0a48771 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2022-04-28 15:37:18 -04:00