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
|
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
|
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
|
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
|
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
|
442f126193
|
Fix compile on xenial which doesn't have hwaccel
|
2021-05-06 11:04:38 -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
|
31a95fa27c
|
add nvenc support
|
2021-05-05 13:58:31 -04:00 |
|
Isaac Connor
|
3645ccea1b
|
Make vaapi accelerated encoding work
|
2021-05-04 20:20:33 -04:00 |
|
Isaac Connor
|
8f27db5d6f
|
Do not stop dbQueue in logTerm. dbQueue is not just for logging.
|
2021-05-04 14:22:02 -04:00 |
|
Isaac Connor
|
4f4a1a4565
|
if sendTextFrame fails, just exit.
|
2021-05-03 16:27:37 -04:00 |
|
Isaac Connor
|
934c726beb
|
Handle camera not being defined in SubpixelOrder and Colours. Remove subpixelorder as it exists in camera only
|
2021-05-03 15:19:45 -04:00 |
|
Isaac Connor
|
80d2f9f098
|
Revert "Don't consult a Camera object to return colours and subpixelorder, we have those as members. Fixes crash in zms"
This reverts commit 48f79da892.
|
2021-05-03 14:19:34 -04:00 |
|
Isaac Connor
|
bc6ba0a772
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-05-03 13:18:51 -04:00 |
|
Isaac Connor
|
8bd876d8c8
|
improve warning message to include the values that don't match
|
2021-05-03 13:18:39 -04:00 |
|
Isaac Connor
|
90dff85e40
|
Only default to BGRA when colours are > 1.
|
2021-05-03 13:17:58 -04:00 |
|
Isaac Connor
|
bf72bb2a22
|
Increase sleep after prime failure up to a minute.
|
2021-05-03 10:38:01 -04:00 |
Peter Keresztes Schmidt
|
e5ceed31cc
|
Image: Fix a typo introduced in 3f5dbb7780
|
2021-05-02 23:22:49 +02:00 |
|
Peter Keresztes Schmidt
|
e5613d0d27
|
Make sure all logging macro calls are terminated with a semicolon
|
2021-05-02 23:08:48 +02:00 |
|
Isaac Connor
|
260fcaadde
|
remove debug
|
2021-05-02 14:07:29 -04:00 |
|
Isaac Connor
|
3f5dbb7780
|
Default to rgba when subpixelorder is not specified
|
2021-05-02 14:07:29 -04:00 |
|
Isaac Connor
|
88147f3f7a
|
add another logInit so that early messages go to zms.log after loading config. Add Image::Initialise so that initialised flag will get set, and add a Deinitialise call so that ram allocated in zm_image gets freed.
|
2021-05-01 14:49:33 -04:00 |
|
Isaac Connor
|
59b1927ad6
|
do dbQUeue.stop in logTerm so we don't have to have an extra line in every executable
|
2021-05-01 14:49:33 -04:00 |
|
Isaac Connor
|
48f79da892
|
Don't consult a Camera object to return colours and subpixelorder, we have those as members. Fixes crash in zms
|
2021-05-01 14:49:33 -04:00 |
|
Isaac Connor
|
ad388e9fc5
|
Free up encodejpg_ccinfo in Deinitialize
|
2021-05-01 14:49:33 -04:00 |
|
Peter Keresztes Schmidt
|
14cb2bc3dd
|
zm_rtsp_server: Remove an unused variable
|
2021-05-01 00:24:54 +02:00 |
|
Peter Keresztes Schmidt
|
68bedfe48f
|
Fix logging format string mismatches
* Remove SZFMTD format macro and use %zu instead for size_t. %zu is understood by every compiler nowadays.
|
2021-04-30 00:26:24 +02:00 |
|
Peter Keresztes Schmidt
|
c3dd8d8a47
|
Logger: Annotate logPrint with format attribute
This allows the compiler to check for mismatches in the format string and the passed parameters.
|
2021-04-29 17:12:44 +02:00 |
|
Isaac Connor
|
0da4127114
|
cleanup ready_count update unneeded. Fix crash on reload due to being disconnected.
|
2021-04-29 07:07:12 -04:00 |
|
Isaac Connor
|
3d11366c0f
|
restart stream when RTSP stream name changes
|
2021-04-29 06:38:42 -04:00 |
|
Isaac Connor
|
1abadfafa1
|
Increase debug log level of allocating image
|
2021-04-28 16:13:57 -04:00 |
|
Isaac Connor
|
e53628e0bd
|
Remove old deinterlace code, make new code in ::decode. For 4 field, use the next image in the queue isntead of doing another capture
|
2021-04-28 16:13:41 -04:00 |
|
Isaac Connor
|
ba652af347
|
Define deinterlace values in an enum
|
2021-04-28 16:13:10 -04:00 |
|
Isaac Connor
|
a9ca6f8c13
|
Check for packets in the queue before we start traversing it to prevent crash
|
2021-04-28 12:12:24 -04:00 |
|
Isaac Connor
|
f61618b244
|
rework rtsp_server to look for new and free up old monitors
|
2021-04-27 16:35:13 -04:00 |
|
Peter Keresztes Schmidt
|
36205258c0
|
Image: Fix crash in Annotate in GRAY8 and RGB24 mode
Actually advance the image buffer pointer by one image line when looping through the codepoint lines.
|
2021-04-27 21:11:50 +02:00 |
|
Isaac Connor
|
2e35d94c94
|
Add missing source_
|
2021-04-27 10:34:22 -04:00 |
|
Isaac Connor
|
d9aac9bea9
|
it is ok to have empty monitors, should detect when new ones arrive
|
2021-04-27 10:28:46 -04:00 |