af354eb718
Merge pull request #3158 from Carbenium/tsan
...
Build: Add ThreadSanitizer (TSan) support
2021-02-11 10:19:31 -05:00
42484e6434
zmc: Fix a deadlock on shutdown/reconnection
...
First stop the analysis threads, then close the monitors and thus drain the packet queues before trying to join the analysis threads since they might hang while waiting for the next packet to arrive.
2021-02-11 15:48:22 +01:00
4c07bf5aae
Build: Add ThreadSanitizer (TSan) support
...
Enable it by setting -DTSAN=1
This setting is mutually exclusive with -DASAN
2021-02-11 00:38:31 +01:00
33cabd3621
Merge pull request #3156 from dodexahedron/3155-log-copies-and-moves
...
Added logging for copies/moves to zmfilter.pl
2021-02-10 17:35:06 -05:00
a7eab75cf9
Added logging for copies/moves to zmfilter.pl
2021-02-10 15:31:10 -07:00
cca4d18d26
need <algorithm> for std::max
2021-02-10 17:29:51 -05:00
51f2d120e4
Free raw image after motion detection when doing passthrough and not saving jpegs
2021-02-10 17:07:58 -05:00
cc09f68426
We use our own jquery. Debian can do it's own thing
2021-02-10 17:07:18 -05:00
393e8b582a
Move the logic of whether to queue a packet into packetqueue::queuePacket
2021-02-10 14:11:00 -05:00
0a1bd3537d
ready_count is now max(warmup_count,pre_event_count). This should ensure that we have enough packets in the packet queue when creating an event.
2021-02-10 13:54:20 -05:00
991e8dc860
Include mysqld_error.h so we can test for specific errors
2021-02-10 13:54:20 -05:00
64cfac9255
Only loop on SQL insert for wait timeout error, not others
2021-02-10 13:54:20 -05:00
a6827674f9
Merge pull request #3154 from Carbenium/no-queue
...
Monitor: Don't push packets into the packet queue when in Monitor mode
2021-02-10 10:41:56 -05:00
2f5dff7244
Monitor: Don't push packets into the packet queue when in Monitor mode
...
There is no consumer for the packets in this mode, so don't queue them up. This saves quite a bit of RAM for mode of operation.
2021-02-10 16:13:47 +01:00
c8f4a18c7c
Use more modern way of including style sheet. Hopefully fixes deprecated add_stylesheet
2021-02-10 10:01:15 -05:00
c32fbed88a
Merge pull request #3153 from Carbenium/drop-zma
...
Drop relicts of zma
2021-02-10 08:31:13 -05:00
687ba03eb4
Drop relicts of zma
2021-02-10 13:26:25 +01:00
2308bfab8e
Add groovy and hirsute to ubuntu builds
2021-02-09 23:32:27 -05:00
8f783c0ec4
Must also include cstdarg for va_start etc al
2021-02-09 23:32:27 -05:00
9879a40c4b
Must include cstring
2021-02-09 23:32:27 -05:00
2a440685eb
remove zma binary from rpm specfile
2021-02-09 20:55:52 -06:00
dcf1ff3133
Merge pull request #3152 from Carbenium/ffmpeg-warnings
...
Fix some ffmpeg deprecation warnings
2021-02-09 20:15:41 -05:00
7ed7ee887b
Merge pull request #3151 from Carbenium/analysis-thread-crash
...
AnalysisThread: Make the class un-movable
2021-02-09 18:21:35 -05:00
a66a9a6f10
Rtsp: Use AvStream.codecpar if available
...
.codec has been deprecated in libavf 57.33.100
2021-02-10 00:21:23 +01:00
e18f9e1f03
FFmpeg: Drop function which is not needed with supported ffmpeg versions
...
avformat_alloc_output_context2 was introduced in libavformat 53.2 (2011). Drop our own implementation which was used if the library version wasn't available. It isn't used anymore an causes compile warnings.
2021-02-10 00:21:23 +01:00
d0b80d63c3
FFmpeg: Fix a version check to avoid deprecation warnings on newer systems
2021-02-10 00:20:34 +01:00
0380bee130
AnalysisThread: Make the class un-movable
...
We depend on an unchanged value of "this" after the creation of the thread otherwise undefined values would be accessed within the std::thread.
2021-02-09 23:54:50 +01:00
8fa1249b33
Utils: Add some helper to create unique_ptrs
...
They follow the C++14 API and can be removed once the language level is increased.
2021-02-09 23:52:13 +01:00
67cd038a4f
Include pre-alarm frames in db
2021-02-09 15:33:09 -05:00
727594e3af
Fix rotated images by allocating image with camera dimensions
2021-02-09 14:53:14 -05:00
13d72bdec6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-02-09 14:24:20 -05:00
470739e1d5
Add debugging if streamStatus.status doesn't exist
2021-02-09 14:24:09 -05:00
79ac92c76d
spacing
2021-02-09 14:23:47 -05:00
1780cfbff1
Add frames_duration
2021-02-09 14:23:34 -05:00
c2ac171811
truncate file when logging to 255 chars so it gets into the db
2021-02-09 14:23:15 -05:00
9b3d423f3d
Separate duration==endtime-starttime from Frames Duration
2021-02-09 14:22:23 -05:00
a5519075f5
Also save ALERT frames to db
2021-02-09 14:22:02 -05:00
c233bf3463
spacing and a fix for duplicated for loop setting up rtsp server
2021-02-09 13:18:34 -05:00
032420beb2
Don't need to init mVideoStream etc as they are done in Camera(). Set stream_index in packet.
2021-02-09 13:16:19 -05:00
05b5927f01
Don't queue audio packets if we aren't saving audio
2021-02-09 11:54:38 -05:00
1bce4f6bfa
When flushing queues, will return 0 when done. Handle it. Also set next dts from pkt, not opkt
2021-02-09 11:30:42 -05:00
e3eebeb9dd
Must return ret to handle case where ret=0.
2021-02-09 11:30:06 -05:00
aab3aed791
Merge pull request #3145 from Carbenium/analysis-thread
...
AnalysisThread: Move it over to std::thread
2021-02-09 09:26:47 -05:00
1bd2fd639e
Merge pull request #3147 from Carbenium/issue-3146
...
Build: Work around CMake version on Xenial not supporting cxx_std_* flags
2021-02-09 09:26:22 -05:00
98d030a5d8
Merge pull request #3148 from Carbenium/comms-namespace
...
Fix some RTSP server related crashes
2021-02-09 09:16:51 -05:00
23a4b5087c
RTSPServerThread: Fix a crash during construction
...
It's a bad idea to use a shared_ptr instance from which the data just got moved away. Rename the instance variable to distinguish them.
2021-02-09 14:50:07 +01:00
4056782954
Comms: Move all classes to ZM:: namespace
...
The Socket class collides with a class named the same way from liblive555. This confuses the linker and links the wrong object leading to a crash when connecting to the RTSP server.
2021-02-09 14:45:33 +01:00
426cace32e
Build: Raise required CMake version to 3.5.0
...
This is the version found in Xenial which is the oldest we support.
2021-02-09 13:20:27 +01:00
4ebfbdef5d
Build: Work around CMake version on Xenial not supporting cxx_std_* flags
...
Closes #3146
2021-02-09 13:20:27 +01:00
888ddc5d63
AnalysisThread: Sprinkle some more std::chrono
2021-02-09 12:26:53 +01:00
Isaac Connor
Peter Keresztes Schmidt
Brandon Thetford
Isaac Connor
Andrew Bauer
Isaac Isaac