Isaac Connor
|
968acc2d43
|
Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed.
|
2022-02-22 08:31:41 -05:00 |
|
Isaac Connor
|
26d89292d7
|
Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed.
|
2022-02-22 08:31:41 -05:00 |
|
Isaac Connor
|
e9b3269278
|
cleanup and add fallback to read/write if no sendfile support.
|
2022-02-22 08:31:41 -05:00 |
|
Isaac Connor
|
00b4ed9c53
|
Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed. Use new reworked zm_sendfile and handle if not all bytes are sent. Fixes #3437.
|
2022-02-22 08:31:41 -05:00 |
|
Isaac Connor
|
0da942a14b
|
rework zm_sendfile to try again if not all bytes were sent. According to the docs, this is entirely possible.
|
2022-02-22 08:31:41 -05:00 |
|
Isaac Connor
|
e523777ece
|
Sync up n_frames, frame_count, curr_frame_id on int instead of a mix of long int, int and unsigned long int
|
2022-02-22 08:31:41 -05:00 |
|
Isaac Connor
|
4f8aba0801
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-02-15 10:41:51 -05:00 |
|
Isaac Connor
|
956579d557
|
handle snap->in_frame being null.
|
2022-02-15 10:41:42 -05:00 |
|
Isaac Connor
|
5fd5c7fdd1
|
Maybe fix build on freebsd by including unistd.h
|
2022-02-15 10:04:37 -05:00 |
|
Isaac Connor
|
91b536b868
|
Change the test for slow functions to mod4. The unrolled and SSE function work on 4 pixels at a time or 16 or 12 bytes depending on colours.This will improve cpu use on resolutions like 1280x800
|
2022-02-14 09:43:48 -05:00 |
|
Isaac Connor
|
6e7e6d9e8e
|
small code cleanup, add Warnings when using slow blend functions.
|
2022-02-11 18:06:43 -05:00 |
|
Isaac Connor
|
2768975f96
|
Only notify one. Anyone waiting is waiting on a lock and only 1 process can get that lock, so only one should try.
|
2022-02-08 10:12:29 -05:00 |
|
Isaac Connor
|
8c13aa7d3a
|
Cleanup LockedPacket, use RAII
|
2022-02-08 10:10:00 -05:00 |
|
Isaac Connor
|
8e689340ce
|
Don't need to check for end of queue as we already did that when adding packet to the queue
|
2022-02-08 10:06:32 -05:00 |
|
Isaac Connor
|
fe01af6966
|
Don't need to test for end() because we added our packet to the queue and still have the lock
|
2022-02-08 09:57:56 -05:00 |
Isaac Connor
|
1982c21e1f
|
Merge pull request #3423 from jp-bennett/master
Starts moving elements from zm_monitor.cpp into nested classes and dedicated files.
|
2022-02-03 17:53:31 -05:00 |
Jonathan Bennett
|
dde3884084
|
Moves Janus and Amcrest into their own nested classes
|
2022-02-03 16:31:07 -06:00 |
|
Isaac Connor
|
da4c880233
|
0 out another used of y-image
|
2022-02-03 12:16:01 -05:00 |
|
Isaac Connor
|
02a2c783e4
|
Disable alleged y-channel image motion detection. Doesn't work.
|
2022-02-03 11:57:27 -05:00 |
|
Isaac Connor
|
67ac0fdffd
|
Disable alleged y-channel image motion detection. Doesn't work.
|
2022-02-03 11:57:00 -05:00 |
|
Isaac Connor
|
838704e58e
|
Add more stop_ tests so that when we are told to terminate, we actually do so.
|
2022-02-03 11:40:17 -05:00 |
|
Isaac Connor
|
b05bc211f7
|
Apparently it is actually the Y channel that we want.
|
2022-02-03 10:50:40 -05:00 |
|
Isaac Connor
|
7e9c707f92
|
V plane is actually the 3rd array entry, not the 4th
|
2022-02-03 10:06:36 -05:00 |
|
Jonathan Bennett
|
89e1c5d53c
|
Move Monitor::MonitorLink to dedicated file
|
2022-02-02 16:51:27 -06:00 |
|
Isaac Connor
|
606c47ba87
|
If possible, use the v-channel from the yuv420p image for motion detection instead of the rgba data.
|
2022-02-02 14:33:58 -05:00 |
|
Isaac Connor
|
3feb4fcc51
|
Merge branch 'master' into master
|
2022-02-02 12:28:17 -05:00 |
|
Isaac Connor
|
4949159b88
|
Rough in pcm alaw support. Untested.
|
2022-02-01 14:06:12 -05:00 |
|
Isaac Connor
|
34d7f192b4
|
Remove field that ffmpeg 5.0 doesn't have.
|
2022-02-01 07:23:12 -05:00 |
|
Isaac Connor
|
6b8cc14723
|
Don't free image data if we added the packet to an event. The lock moves to the event so it's not safe
|
2022-01-31 12:07:09 -05:00 |
|
Isaac Connor
|
e5792c21c9
|
Push locked packets into event packetqueue instead of unlcoked contents. Prevents freeing of data before writing to event, hence crashing.
|
2022-01-28 15:38:18 -05:00 |
|
Isaac Connor
|
42e24614d6
|
Include filename in debugs when writing out jpegs
|
2022-01-26 11:45:07 -05:00 |
|
Jonathan Bennett
|
a2a2f1a781
|
Move variables out of the ifdef gsoap block, as they are used for Amcrest support, too
|
2022-01-25 22:46:09 -06:00 |
|
Jonathan Bennett
|
ec9403fb6f
|
Adds Amcrest On-camera Motion Detection
|
2022-01-25 22:38:00 -06:00 |
|
Isaac Connor
|
961256d2e7
|
terminate when zm_terminate is set. Do a countdown instead of countup. Sleeo for 10000 microseconds instead of 100. This restores the old value
|
2022-01-25 16:24:21 -05:00 |
|
Isaac Connor
|
17e01cb58f
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-01-25 16:23:02 -05:00 |
|
Isaac Connor
|
4d90a816f8
|
Put a lock around jpeg writing. libjpeg is not thread safe
|
2022-01-25 16:22:33 -05:00 |
|
Isaac Connor
|
38da3b4d52
|
add some brackets to make logic more clear
|
2022-01-25 14:28:26 -05:00 |
|
Isaac Connor
|
c8c09e560f
|
Fix mTerminate not being initialised.
|
2022-01-25 14:27:39 -05:00 |
|
Isaac Connor
|
cf82d767de
|
Remove the decoding code, just populate the av_packet. This fixes rtsp decoding because we weren't copying the decoded frame to shm raw image.
|
2022-01-25 14:27:32 -05:00 |
|
Isaac Connor
|
26ae5052f4
|
Fix fail to get Sources in RTSP. the string msg although initially reserved to ZM_NETWORK_BUFSIZ, after use it's capacity is changed whatever it's contents are. So need to re-reserve.
|
2022-01-25 11:55:21 -05:00 |
|
Isaac Connor
|
146ea4822d
|
Bump the db queue limit to 30 before we warn. I only have 1 server that gets over 20 and it is still ok.
|
2022-01-24 09:24:16 -05:00 |
|
Isaac Connor
|
f10d0fd3f5
|
Merge pull request #3413 from jp-bennett/master
Adds janus updates
|
2022-01-23 12:35:42 -05:00 |
|
Jonathan Bennett
|
5485c04bc6
|
Rework of the Janus polling loop
|
2022-01-23 01:07:48 -06:00 |
|
Jonathan Bennett
|
07c5b23aa6
|
Adds Janus streaming checks to polling thread
|
2022-01-22 12:49:08 -06:00 |
|
Isaac Connor
|
9443aaa2d8
|
Do state changes when in RECORD mode as well as it doesn't do motion detection Fixes #3411
|
2022-01-22 13:33:39 -05:00 |
|
Jonathan Bennett
|
52e48c02b6
|
Add janus_path and janus_secret, allowing for more secure and flexible Janus installs
|
2022-01-21 22:23:41 -06:00 |
|
Isaac Connor
|
dec440ead1
|
Unset holdbuffer so that when we connect, we reset the shm buffer pointer. cleanup initializers in Image
|
2022-01-19 15:01:37 -05:00 |
|
Isaac Connor
|
05043a37b1
|
include image index in debug
|
2022-01-19 12:27:16 -05:00 |
|
Isaac Connor
|
ebcb3abf2e
|
image_count is only relevant to capture. decode and analysis should use packet->image_index for indexing into image_buffer, etc.
|
2022-01-19 09:33:33 -05:00 |
|
Jonathan Bennett
|
04cfe372f8
|
Wrap public access function in Gsoap ifdef to remove build warning
|
2022-01-19 00:56:36 -06:00 |