Isaac Connor
|
7a674be285
|
Quiet cppcheck
|
2021-04-20 14:25:17 -04:00 |
|
Isaac Connor
|
32ae30a7b2
|
Fix alarm cause
|
2021-04-20 14:19:29 -04:00 |
|
Isaac Connor
|
433c3388fe
|
Pass where string by ref
|
2021-04-20 14:13:09 -04:00 |
|
Isaac Connor
|
6b1b873e9f
|
Reduce scope of vars, fix return value test of shmat
|
2021-04-20 14:10:58 -04:00 |
|
Isaac Connor
|
ad830e43c6
|
clean up CheckSignal, getting rid of static vars
|
2021-04-20 13:26:47 -04:00 |
|
Isaac Connor
|
7561e88d9c
|
Change %d to %u for monitor id
|
2021-04-20 13:12:00 -04:00 |
|
Isaac Connor
|
f3fb5885a0
|
Improve debugging
|
2021-04-19 13:18:35 -04:00 |
|
Isaac Connor
|
a9afdbddf1
|
Remove AddZones function and remove other commented out code
|
2021-04-19 10:26:08 -04:00 |
|
Isaac Connor
|
5b9745b652
|
fix memleak due to not delete audio_fifo and video_fifo
|
2021-04-17 12:50:26 -04:00 |
|
Isaac Connor
|
5ace2ca082
|
Fix loading Importance in sql. Change zones to a std::list<Zone>
|
2021-04-17 12:50:26 -04:00 |
|
Isaac Connor
|
ab356a3695
|
Add a warning when connecting without disconnecting which can cause memleaks
|
2021-04-12 15:59:31 -04:00 |
|
Isaac Connor
|
939a0f40e6
|
Include image_count in debug line
|
2021-04-11 13:22:37 -04:00 |
|
Isaac Connor
|
ed29021179
|
Rough in an importance setting in monitor that we can use to decrease the log level of certain events like PrimeCapture for cameras that we don't care about
|
2021-04-11 12:59:18 -04:00 |
|
Isaac Connor
|
1ccc416224
|
Merge branch 'release-1.34'
|
2021-04-09 20:00:47 -04:00 |
|
Isaac Connor
|
d9dc61265d
|
Fix DisableAlarms. Use signal when capture fails instead of erroneously using TRIGGER_OFF. Add status to DumpSettings so that we can query it with zmu.
|
2021-04-09 17:46:11 -04:00 |
|
Isaac Connor
|
4bd490d121
|
Set signal=true if capture succeeds.
|
2021-04-08 11:37:27 -04:00 |
|
Isaac Connor
|
2d7479cb59
|
reintroduce Start() methods to analysis and decoding thread
|
2021-04-07 20:36:38 -04:00 |
|
Isaac Connor
|
a63186444b
|
Replace char arrays with std::strings in monitor class.
|
2021-04-07 14:15:55 -04:00 |
Peter Keresztes Schmidt
|
817da4e621
|
Monitor: Make decoder a unique_ptr
The DecoderThread object is owned by the Monitor. Signal this by using unique_ptr.
|
2021-04-06 12:50:05 +02:00 |
|
Peter Keresztes Schmidt
|
fee5ecd72f
|
Monitor: Make analysis_thread a unique_ptr
The AnalysisThread object is owned by the Monitor. Signal this by using unique_ptr.
|
2021-04-06 12:50:05 +02:00 |
|
Isaac Connor
|
4c988860d5
|
Close events in a background thread. Add a ton more debugging
|
2021-04-05 12:56:13 -04:00 |
|
Isaac Connor
|
405be70430
|
Use packetqueue unlock to also notify
|
2021-04-02 21:26:01 -04:00 |
|
Isaac Connor
|
87fc35dbe6
|
Add LOW_PRIORITY to fps status updates
|
2021-04-02 13:09:32 -04:00 |
|
Isaac Connor
|
bcd0e84a31
|
do sws_scale from decoded image to Image using a member context and avframe to save a few cycles
|
2021-04-01 13:22:57 -04:00 |
|
Isaac Connor
|
0e00cb0289
|
use the new packetqueue::unlock to unlock packets and wake up decoding thread
|
2021-04-01 11:52:47 -04:00 |
|
Isaac Connor
|
fd23b3e284
|
Adjust debug levels
|
2021-03-31 16:49:19 -04:00 |
|
Isaac Connor
|
c73393579d
|
Handle event creation failing gracefullyish
|
2021-03-31 12:06:33 -04:00 |
|
Isaac Connor
|
8c6f03a4e4
|
Move waiting for decoding down into motion detection section. Add a test for successful decode. Decode may not provide an image.
|
2021-03-30 09:16:45 -04:00 |
|
Isaac Connor
|
3202db1b33
|
Move waiting for decoding down into motion detection part, which is what needs it. Not sure why it was up so high. This should allow more ram freeing for people with analysis fps set to something.
|
2021-03-30 09:16:44 -04:00 |
|
Isaac Connor
|
0bfbdd6121
|
Use our new CODEC define to cleanup the code
|
2021-03-30 09:15:28 -04:00 |
|
Isaac Connor
|
9463cf8565
|
I can't imagine what fps_report_interval has to do with event being longer than section_length. Use analysis_image_count in log
|
2021-03-29 09:57:57 -04:00 |
|
Isaac Connor
|
52cb182ae3
|
Load max_image_buffer_count in monitor and set it in packetqueue. rename max_video_packet_count to pre_event_video_count in packetqueue and adjust logic. When queuing packets check to ensure that we aren't going over. Delete packets from front if possible, do not queue packet if not possible
|
2021-03-26 14:26:37 -04:00 |
|
Isaac Connor
|
b8b20917be
|
setKeepKeyframes when not PASSTHROUGH
|
2021-03-22 12:05:22 -04:00 |
|
Peter Keresztes Schmidt
|
4e8c7d1f7c
|
Eliminate non-thread-safe calls to localtime
localtime uses an internal static storage to which a pointer is given as return value.
Due to this it is not safe to call localtime from multiple threads since the same static storage is used.
Use localtime_r instead which allows to pass in a tm struct.
Fixes:
https://github.com/ZoneMinder/zoneminder/security/code-scanning/24
https://github.com/ZoneMinder/zoneminder/security/code-scanning/25
https://github.com/ZoneMinder/zoneminder/security/code-scanning/26
https://github.com/ZoneMinder/zoneminder/security/code-scanning/27
https://github.com/ZoneMinder/zoneminder/security/code-scanning/28
https://github.com/ZoneMinder/zoneminder/security/code-scanning/30
https://github.com/ZoneMinder/zoneminder/security/code-scanning/31
https://github.com/ZoneMinder/zoneminder/security/code-scanning/33
https://github.com/ZoneMinder/zoneminder/security/code-scanning/58
https://github.com/ZoneMinder/zoneminder/security/code-scanning/59
https://github.com/ZoneMinder/zoneminder/security/code-scanning/63
https://github.com/ZoneMinder/zoneminder/security/code-scanning/64
https://github.com/ZoneMinder/zoneminder/security/code-scanning/65
|
2021-03-21 21:42:02 +01:00 |
Isaac Connor
|
7c9eb42ebb
|
Merge branch 'master' into 3197-record-event-close-mode
|
2021-03-21 13:03:26 -04:00 |
|
Isaac Connor
|
a042e4bf77
|
spacing
|
2021-03-20 19:27:18 -04:00 |
SirLouen
|
db7e9edcab
|
Issue #3197 Improvement
|
2021-03-21 00:00:36 +01:00 |
|
SirLouen
|
33f98a0d40
|
Issue #3197 Add RECORD to Event_Close_Mode time
|
2021-03-20 20:02:52 +01:00 |
|
Isaac Connor
|
edefbfcad6
|
Remove assumptions about Analysis being about motion detection. Fixes mem leaks in Monitor mode
|
2021-03-18 09:24:27 -04:00 |
|
Isaac Connor
|
f4506a8f35
|
We always need an analysis thread.
|
2021-03-17 23:41:00 -04:00 |
|
Isaac Connor
|
ccb1bc1a7d
|
Have to wait until we are finished with the packet before unlocking.
|
2021-03-17 16:11:31 -04:00 |
|
Isaac Connor
|
fb28c6b365
|
Fix login in Decode for non-ffmpeg monitors
|
2021-03-17 15:53:14 -04:00 |
|
Isaac Connor
|
284fe52b5f
|
fix double stop/free of decoder and analysis threads
|
2021-03-17 12:57:45 -04:00 |
|
Isaac Connor
|
dca34544ec
|
move analysis thread into monitor. populate analysis_it and decoder_it in Prime instead of constantly checking for them. Handle cases where LockedPacket are null due to shutdown
|
2021-03-17 12:47:52 -04:00 |
|
Isaac Connor
|
657a5edda4
|
If decoding disabled, set signal and last_write_time in the Capture thread. So that zm_watch knows we are alive
|
2021-03-17 10:11:06 -04:00 |
|
Isaac Connor
|
74616d1061
|
Update CaptureFPS SQL to just do an update and don't use static sql. TThis may fix a signal 6 crash that we have been seeing
|
2021-03-17 10:06:45 -04:00 |
|
Isaac Connor
|
12ed02a5b0
|
Move trigger detection before motion detection. Only wait for decoding if decoding is enabled
|
2021-03-16 20:07:59 -04:00 |
|
Isaac Connor
|
5e54a63bd5
|
Only load zones if doing something other than QUERY. Only delete decoder if there is one.
|
2021-03-16 13:26:40 -04:00 |
|
Isaac Connor
|
76267bc57f
|
put back deleting the raw image when not saving jpegs. We only need it for the snapshot and that should be the alarmed image anyways.
|
2021-03-16 12:08:11 -04:00 |
|
Isaac Connor
|
9903e909af
|
Rework locking in ZMPacket by using a new class called ZMLockedPacket.
|
2021-03-15 17:05:30 -04:00 |