ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,823 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

18823 Commits

Author SHA1 Message Date
Peter Keresztes Schmidt 3fc3a81286 Box+Coord: Remove empty cpp files 2021-05-14 20:14:50 +02:00
Isaac Connor 2afbbb17d2 Must upload source package. Get rid of -sd 2021-05-14 10:41:36 -04:00
Isaac Connor b17edf3153 Bump version to 1.36.0 2021-05-13 19:28:32 -04:00
Isaac Connor a56b4053fa Use resize in stead of reserve so that image_buffer.size actually has a value 2021-05-13 14:24:03 -04:00
Isaac Connor d52b53e690 Add further bounds checks when accessing image_buffer 2021-05-13 09:31:59 -04:00
Isaac Connor 70946921bc fix code to release lock before notifying 2021-05-13 08:54:55 -04:00
Isaac Connor 5a8fa9efc9 Remove dead code and useless debug 2021-05-12 18:54:07 -04:00
Isaac Connor 6f977da94d Fix potential outofbounds access to image_buffer in getSnapshot() 2021-05-12 14:21:54 -04:00
Isaac Connor e246083be5 Add StartDateTime Attr in sort dropdown 2021-05-12 10:32:03 -04:00
Isaac Connor 363b017977 If error was unauthorized, do a reload. 2021-05-12 10:32:03 -04:00
Isaac Connor bdae5dd9f8 Sort field should be StartDateTime not StartTime 2021-05-12 10:32:03 -04:00
Isaac Connor c080dd8a12 Fixes #2992. If no definition for a monitor is found, don't modify it. 2021-05-11 15:29:10 -04:00
Isaac Connor 76171fcc43 If not doing passthrough, don't need to find the nearest keyframe 2021-05-11 10:22:40 -04:00
Isaac Connor 510b3e606b Continue if frame file not found. Output useful text jpeg 2021-05-11 09:33:33 -04:00
Isaac Connor 726f1f616d Merge branch 'update_docs_1_34' 2021-05-10 14:53:14 -04:00
Isaac Connor f0abcdf585 Merge branch 'release-1.34' into update_docs_1_34 2021-05-10 14:48:50 -04:00
Isaac Connor b8e3cc33f0 make it so that the queue will more likely be empty on termination. Do not queue more sql if terminate flag is set. 2021-05-10 12:54:35 -04:00
Isaac Connor f3b4ccf758 Fix scaling when scale to fit 2021-05-10 11:08:16 -04:00
Isaac Connor b1ac0e61a9 put back upstream version 3.2.0 of Crud 2021-05-09 18:18:03 -04:00
Isaac Connor 747c714699 put back up to date RtspServer 2021-05-09 18:15:37 -04:00
Isaac Connor 3cd9bdccd5 style and performance improvements reported by cppcheck 2021-05-09 16:39:38 -04:00
Isaac Connor 01834d4ddc finish converting Capture to std::shared_ptr 2021-05-09 07:35:47 -04:00
Isaac Connor e970c46f7b fix memleak. Fixes #3217 2021-05-09 07:18:36 -04:00
Isaac Connor 2cf6ad8089 Switch ZMPacket * to a shared_ptr<ZMPacket>. This is so that in LockedPacket we can unlock and then notify and be confident that packet_ won't have been deleted. Change ZMPacket->timestamp to be a timeval instead of timeval *. This might not have been necessary but I like it. No longer cuse the ZMPacket object to wrap the shared image buffers and timestamps. Use a vector for image_buffers. 2021-05-08 21:14:20 -04:00
Isaac Connor 9ee24170a9 use packetqueue.unlock instead of deleting the lock so that we wake up people waiting 2021-05-08 15:57:00 -04:00
Isaac Connor bc11e6a95b Include pre event count in min estimated ram use 2021-05-08 15:47:29 -04:00
Isaac Connor d3e91da514 sigh. Move the snap unlock further down protecting another use of snap. Use a video test instead of image count to determine videoness of the snap 2021-05-08 12:35:28 -04:00
Isaac Connor bd6566a819 Have to clearpacket while holding the lock on snap. Otherwise it can get deleted the moment we unlock it. 2021-05-08 12:26:13 -04:00
Isaac Connor ff0d6e8e0f remove duplicated getModal and pass fid=fid to getModal 2021-05-07 15:34:08 -04:00
Isaac Connor ea3bffb402 make getModal take additional query parameters 2021-05-07 15:33:49 -04:00
Isaac Connor 7efbf78260 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-05-07 14:23:39 -04:00
Isaac Connor a91197b47c reset score_ to zero when we return for failing to meet pixel filters 2021-05-07 14:23:36 -04:00
Isaac Connor 4685c63fab Add early return if pktQueue is empty so we can assume that it isn't below. Add notifications if we wake up and find that we have terminated so as to wake up any other waiters. Fixes failure to terminate when deinterlacing because both decoder and analysis are waiting 2021-05-07 14:04:51 -04:00
Isaac Connor 9c6d3989d3 Fix cases of failing to get second packet in de-interlacing 2021-05-07 14:03:36 -04:00
Isaac Connor 5ca5ce32e9 More debugging code, use nullptr instead of null 2021-05-07 09:11:00 -04:00
Isaac Connor 43f2f195f1 Fix a case in get_event_start_packet_it where if no pre_event_count we log an error and maybe don't start on a keyframe 2021-05-07 09:10:26 -04:00
Isaac Connor 4ea48708ed move the code that waits for decoder to outside the motion detection area. In record mode decoding can happen behind analysis which seems like a good idea, except that then analysis won't free up the raw image. 2021-05-07 09:09:40 -04:00
Isaac Connor 9e6367c7c3 look for 264 instead of x264 2021-05-06 17:33:04 -04:00
Isaac Connor 373fae2511 BadEncoder Params and PathNotEncoded are warnings, not errors 2021-05-06 11:05:05 -04:00
Isaac Connor 442f126193 Fix compile on xenial which doesn't have hwaccel 2021-05-06 11:04:38 -04:00
Isaac Connor b8f0d90000 Put back Estimated Ram Use. Rework it to provide min/max 2021-05-06 10:17:46 -04:00
Isaac Connor 0adc2d96d6 Revert "remove estimated ram use stuff as it is no longer possible" 
This reverts commit 2e675a338b.
 2021-05-06 09:54:06 -04:00
Isaac Connor f4bbacb3f4 add VideoWriter and Codec filters so that you can't select an h265 encoder for h264 etc 2021-05-05 16:48:49 -04:00
Isaac Connor ed97ff495b Unhide Codec, hide OutputContainer 2021-05-05 16:48:01 -04:00
Isaac Connor b0b6de948d Add h265 encoding with libx265, hevc_vaapi and hevc_nvenc 2021-05-05 16:47:39 -04:00
Isaac Connor 8aacdb37cc Bump to 1.35.28 2021-05-05 15:03:51 -04:00
Isaac Connor e514c77e90 Change encoder to a text field. enums will be too much of a hassle 2021-05-05 14:09:22 -04:00
Isaac Connor 09e5c47f3e Hide COntainer and OutputCodec options. I don't want people playing with them righ tnow. 2021-05-05 14:03:38 -04:00
Isaac Connor 2dfe66663d Remove mjpeg and mpeg options. They don't make sense. Add classes so we can hide Encoder and OutputContainer options 2021-05-05 14:03:02 -04:00
Isaac Connor 31a95fa27c add nvenc support 2021-05-05 13:58:31 -04:00