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

4624 Commits

Author SHA1 Message Date
Isaac Connor 0dc9017472 reset starttime when changing events. Fixes super fast playback after switch to next event. Also, skip some unneeded calculations and logging. 2021-10-28 13:02:58 -04:00
Isaac Connor 4b5bc09c41 Merge new logic from master. We now delete a non-keyframe from head instead of waiting in capture. 2021-10-25 17:03:36 -04:00
Isaac Connor c600725a1a Fix monitor type labels by adding an Unknown for entry 0. Implement Function_Strings. Fix decoding_enabled not being recalculated correctly because we havn't loaded savejpegs or videowriter yet. 2021-10-25 16:44:09 -04:00
Isaac Connor 7517bdc6ec Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2021-10-25 16:44:01 -04:00
Isaac Connor 6245a4df6a Correct logic so that RECORD and MOCORD also get events. 2021-10-19 15:24:01 -04:00
Isaac Connor 7cd8f3d887 Only record when in modect or nodect. Linked monitors would cause a monitor in monitor mode to record 2021-10-19 14:55:59 -04:00
Isaac Connor 1dd19d425a always correct decoding_enable, as zms needs to know it's correct value 2021-10-19 13:15:54 -04:00
Isaac Connor f2e537f177 Fix loading importance. Needs to be -1 not -2. The first value is 1, but we want zero based. 2021-10-19 13:13:18 -04:00
Isaac Connor 7b5ab0adae fix index -> image_index 2021-10-17 15:13:14 -04:00
Isaac Connor ed901b0235 Improve debug logging of packetqueue cleaning 2021-10-17 15:01:55 -04:00
Isaac Connor aa44bb0d12 spacing. Use a separate boolean to tell if we have specified a new value for controls. This allows negative settings. Fix zmy outputting brightness when contrast is specified. 2021-10-06 10:37:54 -04:00
Isaac Connor cab4c24d06 Remove redundant notify_all, spelling mistake 2021-09-15 14:11:32 -04:00
Mike Dussault b670bf98e0 Fixed a bug in Image::Buffer that would return the wrong location in the image if the image had > 1 channels (and if the request were for x > 0). 2021-09-15 14:11:16 -04:00
Isaac Connor 2b18dd5978 Don't crash when unable to create source. erase will call the desctructor. Fixes #3344 2021-09-15 14:11:03 -04:00
Isaac Connor 6b8dc07018 wait won't wake up other threads, so notify first. Since we have the lock, this should be ok 2021-09-15 14:10:52 -04:00
Isaac Connor ef74294d32 More properly fix the threading lock. Instead of waiting on a packet, release it and wait on the packetqueue. 2021-09-15 14:10:25 -04:00
Isaac Connor 31a6ab2224 notify anyone waiting in packetqueue before waiting on a packet in motion detection. Should fix decode lockup 2021-09-15 14:09:31 -04:00
Isaac Connor 0162ec2c39 Add missing update_function_pointers so that we use SSE blend functions. Significantly reduces cpu use in motion detection. 2021-09-13 15:04:06 -04:00
Isaac Connor c47a66559a Need to increase frame_count or else frame_count%frame_mod will never == 0 2021-09-10 18:01:32 -04:00
Isaac Connor 6b095a17aa Fix std::string to const char * 2021-09-08 18:46:58 -04:00
Peter Keresztes Schmidt 9cc4bbbe86 LocalCamera: Add a missing include to fix FreeBSD build 
Fixes #3330
 2021-09-08 13:58:34 -04:00
Isaac Connor 1f5ae94c20 Fix errors due to not stopping the dbQueue. Fix crash when querying v4l devices 2021-09-04 12:33:23 -04:00
Isaac Connor 0e24b03785 Make failure to resolve non fatal 2021-09-04 12:17:50 -04:00
Isaac Connor ae90ebf74f Return early if packetqueue is empty instead of getting the lock. Return early in clear() if we are not initialised 2021-09-04 12:16:18 -04:00
Isaac Connor 431417ea8b Use old time code as this is 1.36 2021-09-03 12:19:53 -04:00
Isaac Connor e0e81a3769 Fix frame_count fps when paused 2021-09-03 11:39:34 -04:00
Isaac Connor 94662dc170 Fix viewing fps display by keeping track of last update time, last frame count and actually calculate it based on frames sent over a period of time. 2021-09-03 11:38:09 -04:00
Isaac Connor 132fc84c31 Spacing and fix the bogus setting shared_data->valid to false on disconnect. Other processes call disconnect. Only the capturing thread should set it to false. 2021-09-03 11:35:54 -04:00
Isaac Connor 199e86e92a spacing 2021-08-29 09:30:52 -04:00
Isaac Connor 85ade02cba Set shm->valid to false on disconnect. 2021-08-29 09:30:30 -04:00
Isaac Connor c06cda6a65 Handle the case when the monitor doesn't exist more gracefully and not crash. Fixes #3316 2021-07-08 10:06:49 -04:00
Isaac Connor 610fdd3129 Remove the code to do adaptive skipping. We should never sleep when doing Analysis unless an error occurred. 2021-06-22 14:34:28 -04:00
Isaac Connor 9dd960beac Actually close the camera in localcamera::Close 2021-06-08 14:09:33 -04:00
Isaac Connor 1a6dc18a09 simplify test for being decoded. timestamping needs to be done as well 2021-06-08 14:05:23 -04:00
Isaac Connor 25bce3b8ca Adjust debug logging 2021-06-08 14:04:44 -04:00
Isaac Connor 85b35cf82c Use new get_packet_and_increment_it in decoder. Adjust some debugging levels 2021-06-08 14:04:35 -04:00
Isaac Connor a903ab5d09 Introduce get_packet_and_increase_it just so we can lose an extra grab lock and function calls, etc. In queuePacket, if the queue is full, WAIT instead of failing to queue. 2021-06-08 14:03:37 -04:00
Isaac Connor 61de5eaae5 More debugging around clearQueue. return early if deleting 2021-06-08 14:00:27 -04:00
Isaac Connor a676f7c407 SHould reset state as well as shared_data->state 2021-06-08 13:56:03 -04:00
Isaac Connor eda96d24e0 fix crash when in alert state with no event 2021-06-08 13:55:47 -04:00
Isaac Connor 5bdbb25efb Don't print out buffer since it isn't zero terminated 2021-05-30 18:31:57 -04:00
Isaac Connor cd36bd9bf5 Merge pull request #3266 from Carbenium/fill-out-of-bounds 
Image: Remove std::vector out-of-bounds access when filling polygons
 2021-05-30 10:55:22 -04:00
Isaac Connor c7e9144124 Merge pull request #3257 from Carbenium/ffmpeg-stretch 
FfmpegCamera/Videostore: Disable hwaccel for ffmpeg found in Debian Stretch
 2021-05-25 13:16:12 -04:00
Peter Keresztes Schmidt e659543d0a Logger: Fix DB log messages not being populated 
We need to `resize` the buffer string since `reserve` does not guarantee that the buffer is
actually available.

Follow-up on 298415fff3
 2021-05-25 11:29:32 -04:00
Isaac Connor a0df6aacaf Spacing 2021-05-21 10:38:55 -04:00
Isaac Connor 4fcdeb7287 Fix alignment in get_out_frame. Fixes #3233. If width % 32 then we can't use the more efficient 32 aligned scaling. 2021-05-21 10:37:51 -04:00
Isaac Connor 797a4adf70 Merge branch 'master' into fix_out_of_files_in_encoding 2021-05-20 18:56:16 -04:00
Isaac Connor 2f78916ab8 change mem_file to std::string to resolve initialization problems 2021-05-20 16:28:22 -04:00
Isaac Connor 16d9819796 include memory to fix build on centos 7 2021-05-20 15:56:31 -04:00
Isaac Connor 7ad92e51c3 Fix initializers to compile on centos7 2021-05-20 15:56:15 -04:00