Commit Graph

19849 Commits (af57b5358345554a9ae469cec70f9e04401d3660)

Author SHA1 Message Date
Isaac Connor 57515e4b5f bump version to 1.36.23 2022-08-05 10:55:22 -04:00
ovargasp e09959f9e3 Modify config.php.in
Modifies config.php to use ZM_TIMEZONE if defined by user
2022-08-05 10:54:34 -04:00
Isaac Connor d286c308c7 Fix failed build 2022-08-05 10:53:14 -04:00
Isaac Connor 5042bb2849 update version to 1.36.22 2022-08-05 09:10:29 -04:00
Isaac Connor 6f0a664a7c Merge pull request #3557 from teridon/axiszoomfix
Make proportional zoom and movement work for AxisV2 API
2022-08-05 09:08:47 -04:00
Isaac Connor 708ace4ab5 Setting padding to 0 for ptz buttons 2022-08-05 09:08:28 -04:00
Isaac Connor ae125e31ed Set button padding to 0 for ptz buttons 2022-08-04 09:29:04 -04:00
Isaac Connor 318062951f packet_counts is always true here 2022-08-02 16:38:45 -04:00
Isaac Connor f97be5d5b8 Fix ram leak due to logic inversion 2022-08-02 16:38:45 -04:00
Isaac Connor 4719916164 Fix a poorly worded debug 2022-08-02 16:38:45 -04:00
Isaac Connor 78766befe6 Comment out debugging. This is fast path stuff and this code seems to work. 2022-08-02 16:38:45 -04:00
Isaac Connor c720af7a64 Reduce logging in clearPackets 2022-08-02 16:38:44 -04:00
Isaac Connor 2bd8ba629b Log reorder_queue_size 2022-08-02 14:39:55 -04:00
Isaac Connor e0fb0dcfb8 Sync up with c++ shm alignment to fix same size of 32bit 2022-08-02 14:39:11 -04:00
Isaac Connor a737d98381 Fix logic around warning about keyframe interval being larger than max image buffer count. 2022-08-02 14:38:05 -04:00
Isaac Connor 22331e02cd Fix ever increasing duration list 2022-08-02 14:36:39 -04:00
Isaac Connor 335393ded8 Use parseInt to turn '0' into 0 2022-07-29 14:02:17 -04:00
Isaac Connor 78ba9cc74f When selecting AlarmedZone, must check for SCore > 0. 2022-07-29 14:01:03 -04:00
Isaac Connor fc52045a52 fixup logic inversion on test_post_sql_conditions. condense code. 2022-07-29 14:00:19 -04:00
Isaac Connor 9b3be9a392 db limits should not be affected by pre-conditions, so include the limit regardless of pre-sql-conditions. 2022-07-29 14:00:06 -04:00
Isaac Connor 456549b7b4 Fix logic inversion on test_pre_sql_conditions 2022-07-29 13:59:56 -04:00
Isaac Connor 391b1f13b1 Only decremember warned_count if > 0. Fixes too much logging. Add warning about keyframe interval being > max image buffer setting. 2022-07-29 12:42:13 -04:00
Isaac Connor 7542cbb4ee
Merge pull request #3551 from dougnazar/fix_crash
Fix zmc Segfault on 1.36.20
2022-07-28 14:41:34 -04:00
Doug Nazar 3ba3a32b8c Don't manually copy AVPacket fields before av_packet_ref
av_packet_ref() calls av_packet_copy_props() to copy dts,pts,duration,etc.
and then properly either refs or makes a copy of data and sets size.
2022-07-28 13:11:51 -04:00
Doug Nazar 54dda46b07 Don't deref audio_out_stream if it doesn't exist. 2022-07-28 13:10:16 -04:00
Isaac Connor feaca5eb2a Don't reload img steam on auth hash change. Just update the global variable. 2022-07-24 20:39:41 -04:00
Isaac Connor 19e0d2bcc2 Remove remaining locale stuff from language files 2022-07-14 13:18:35 -04:00
Isaac Connor 6a92cea271 Increase version to 1.36.21 2022-07-13 18:50:15 -04:00
Isaac Connor b23de8044b Convert missed strftimes to dateTimeFormatter. Fixes #3526 2022-07-13 18:49:13 -04:00
Isaac Connor 58c4506720 Fix memleak when not doing passthrough 2022-07-13 18:41:51 -04:00
Isaac Connor d5d797ddac Only do the vsnprintf if the log is actually going to happen 2022-07-13 18:35:59 -04:00
Isaac Connor 6b339e2e8a Revert "Include pkt_pts and/or pkt_dts in frame dump"
This reverts commit 202f96f15a.
2022-07-13 14:15:03 -04:00
Isaac Connor 626320a240 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2022-07-12 14:18:14 -04:00
Ingemārs 280d18cbd5 Update config.php.in 2022-07-12 14:17:29 -04:00
Isaac Connor e52187b85f move dateFormatters to config. This is so that they get setup even if not using index.php. Like cakephp for example. 2022-07-12 14:17:15 -04:00
ovargasp ea1f1dbc3c translations 2022-07-12 13:31:16 -04:00
ovargasp f652791f15 translations... 2022-07-12 13:30:07 -04:00
Isaac Connor 9e1dc90aef Rough in remove_password function + tests 2022-07-12 13:28:58 -04:00
Isaac Connor dd02b56f13 Use remove_authentication instead of mask_authentication 2022-07-12 13:27:51 -04:00
ovargasp 071301ffd9 fix translation for labels 2022-07-12 13:27:10 -04:00
Isaac Connor d0a8a65b7b Put back inlcuding en_gb in en_us 2022-07-12 10:14:48 -04:00
Isaac Connor 01f963933e Fix eslint 2022-07-11 15:11:09 -04:00
Isaac Connor c97b35e6c8 Convert frame->pts to stream pts. Add a seek if jumping a long way into the mp4 2022-07-11 15:09:37 -04:00
Isaac Connor df5cd98492 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2022-07-11 14:35:35 -04:00
Isaac Connor c88d243e31 Send out a quit command when jumping to prev/next video so that hopefully zms exits. 2022-07-11 14:35:24 -04:00
Isaac Connor d7eb8045ed Use ints when comparing maxfps and effectivefps so that small decimal differences in fps don't matter. 2022-07-11 14:33:07 -04:00
Isaac Connor 66fa726043 In ffmpeg 2.8 frame->pts never gets populated. So populate it from either pkt_pts or pkt_dts depending on ffmpeg version 2022-07-11 14:32:32 -04:00
Isaac Connor 202f96f15a Include pkt_pts and/or pkt_dts in frame dump 2022-07-11 14:32:03 -04:00
Isaac Connor a765cf61be Convert reorder_queue_size to size_t 2022-07-10 09:35:22 -04:00
Isaac Connor 3836bff311 Use encoder options to specify reorder_queue size used. Clean up repeated options parsing 2022-07-07 11:35:34 -04:00