Commit Graph

18396 Commits

Author SHA1 Message Date
Isaac Connor d8afd58072 Remove 1 seconds sleeps from db timeout loops. 1 second is a long time. Remove UpdateFramesDelta code which is no longer needed 2021-02-19 12:07:59 -05:00
Isaac Connor a8e63e4f20 watch for zm_terminate in db while loops 2021-02-19 12:07:12 -05:00
Isaac Connor 964b3dd05a Merge branch 'master' of github.com:zoneminder/ZoneMinder 2021-02-19 09:03:31 -05:00
Andrew Bauer 3fb1054093 bstable export requires tableExport plugin 2021-02-18 20:22:19 -06:00
Isaac Connor 045cd219f8 Move clear packetqueue logic to it's own function and call it from the analysis thread. 2021-02-18 19:25:40 -05:00
Isaac Connor 78a5e78e4c Add locking to get_event_start_it. Packets could get deleted while we are figuring this out. 2021-02-18 16:59:17 -05:00
Isaac Connor 0b0df96271 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-02-18 16:05:10 -05:00
Isaac Connor 5ad9244a73 Use new db utility functions to simplify event creation code 2021-02-18 16:01:45 -05:00
Isaac Connor 63a45888a0 Introduce utility functions zmDbDo and zmDbDoInsert. 2021-02-18 16:01:30 -05:00
Isaac Connor bc41cd944e Add missing db_lock.unlock() 2021-02-18 15:00:30 -05:00
Isaac Connor 9502762ce8 WIP cleanup. Don't need to malloc ram as rfbInit will do it. We may need to allocated a larger buffer though, so may need to give vncserver a different malloc function 2021-02-18 13:47:27 -05:00
Isaac Connor c99f43205d add parenthesis for safety 2021-02-18 13:47:27 -05:00
Isaac Connor a4d8ef5d8f Use new version of fix_deprecated_pix_fmt 2021-02-18 13:47:27 -05:00
Isaac Connor 6d8a7a7a4c add SWSCale::GetBufferSize to reduce duplicated lines of code. Makes input buffer size not have to match the aligned size. Reading from doesn't generally cause a crash. 2021-02-18 13:47:27 -05:00
Isaac Connor 127e15ba3a Don't crash if we ask for packet count of an invalid stream 2021-02-18 13:47:27 -05:00
Isaac Connor c7dede0083 Cleanups in connect/disconnect 2021-02-18 13:47:27 -05:00
Isaac Connor 8a329df5ec change how fix_deprecated_pix_fmt works to return a value so we can use it elsewhere 2021-02-18 13:47:27 -05:00
Isaac Connor 04c13c6ff3 Handle value of auto for encoder 2021-02-18 13:30:38 -05:00
Isaac Connor 0d59584250 Only set DefaultVideo if we are successful at opening videoStore. Set save_jpegs flag in db record if we turn it on after failing videoStore. 2021-02-18 13:30:05 -05:00
Isaac Connor f05488ee49 better error message when can't set crf 2021-02-18 11:55:09 -05:00
Isaac Connor b40a31d76f Move content of setMaxVideoPcakets into .cpp 2021-02-18 11:54:50 -05:00
Isaac Connor b1f337b6e7 Move setMaxVideoPackets down to where pre_event_count has a value 2021-02-18 11:54:32 -05:00
Isaac Connor 2dfb07a69b Must set StateId as well as it cannot be Null. Default to 1 2021-02-18 10:39:39 -05:00
Isaac Connor ba6797a143 make definitionPanel have height to fix jumping around as scroll bar appears/disappears 2021-02-18 10:25:05 -05:00
Isaac Connor f6c2e35fe9
Merge pull request #3164 from jim-perkins/patch-1
Update HikVision.pm
2021-02-18 09:09:26 -05:00
Jim Perkins 9a37c393cc
Update HikVision.pm
ERR [Can't access name:zoomStop AUTOLOAD:ZoneMinder::Control::HikVision::zoomStop member of object of class ZoneMinder::Control::HikVision from main:186]

https://forums.zoneminder.com/viewtopic.php?f=9&t=25442&p=119856#p119856
2021-02-17 19:02:01 -06:00
Isaac Connor 3e10c3a8a4 Fix return codes 2021-02-17 16:42:48 -05:00
Isaac Connor 2a49bd124f Add VNC monitor type 2021-02-17 16:39:16 -05:00
Isaac Connor cf6d2caef7 Make setting fmt non fatal. 2021-02-17 16:34:19 -05:00
Isaac Connor 0dc748acb5 drop back to compat 12 for buster 2021-02-17 14:13:42 -05:00
Isaac Connor 99568b8046 remove debian vcs 2021-02-17 13:41:52 -05:00
Isaac Connor cf9406a1e8 undef max if defined in rfb/rdbclient.h 2021-02-17 13:40:12 -05:00
Isaac Connor 33b9dae0f2 fix use of uint32_t for buffer indexes 2021-02-17 13:38:52 -05:00
Isaac Connor 1f2c7d3f98 allow debhelper >13 2021-02-17 13:17:30 -05:00
Isaac Connor f0d8a654f8 Remove debug, use fewer lines 2021-02-17 13:11:55 -05:00
Isaac Connor c608af4df7 Correct timeline when using Weekday 2021-02-17 13:11:02 -05:00
Isaac Connor d2777d2fe4 Remove ffmpeg from recommends. We depend on it 2021-02-17 12:53:30 -05:00
Isaac Connor 0edbb3d9c4 debug is optional, not extra 2021-02-17 12:52:06 -05:00
Isaac Connor 0d0be59b6b Need to require debhelper 13 2021-02-17 12:51:44 -05:00
Isaac Connor a3ed986343 Fix filename 2021-02-17 12:40:41 -05:00
Isaac Connor 4a1efe56ff remove --parallel which isn't needed anymore 2021-02-17 12:40:27 -05:00
Isaac Connor 8c85ffd904 Remove apache2.2 auth lines 2021-02-17 12:40:14 -05:00
Isaac Connor 8a3ea42528 Remove Uploaders. Update mysql packages to be default- 2021-02-17 12:39:56 -05:00
Isaac Connor b4c594b15c Use apache2_invoke instead of enmod 2021-02-17 12:32:06 -05:00
Isaac Connor b58ecca040 Allow RTSPServer to be unselected 2021-02-17 12:07:55 -05:00
Isaac Connor 8e4922665f Add icons to installed files 2021-02-17 11:56:43 -05:00
Isaac Connor 217d632f1a Remove epadding, last_frame_score replaced it 2021-02-17 11:54:30 -05:00
Isaac Connor 6007914344 we don't build libzoneminder-perl at this time, so don't try to instal it's man pages 2021-02-17 11:49:59 -05:00
Isaac Connor a60d683f73 Don't build man pages. They will be built by dh 2021-02-17 11:07:33 -05:00
Isaac Connor f061c25183 Make failure to set video standard non-fatal. 2021-02-17 11:02:56 -05:00