Isaac Connor
|
c0f53382c8
|
Merge pull request #3196 from Carbenium/clang-build-fix
Fix build under clang
|
2021-03-18 15:37:56 -04:00 |
Peter Keresztes Schmidt
|
d1bbfdaf6b
|
Build: Enable -Wconditionally-supported on GCC
We want to have warnings if we use some implementation-specific features of GCC
to be able to keep compatibility with clang.
|
2021-03-18 20:02:23 +01:00 |
|
Peter Keresztes Schmidt
|
7a4c34ec7e
|
RemoteCameraHttp: Fix a log message
|
2021-03-18 20:02:20 +01:00 |
Isaac Connor
|
4cb38a119e
|
Fix saving Filters and other objects. Apparently comparing 0 to NOW() doesn't work.
|
2021-03-18 14:09:15 -04: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
|
1b876f24f9
|
Must have Id as well in order to know which monitor to control
|
2021-03-17 17:15:04 -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
|
079d3361a2
|
Rework to read content_length bytes at once. Micro-optimisation
|
2021-03-17 15:52:55 -04:00 |
|
Isaac Connor
|
ec8e0f5997
|
replace while(1) with while(not zm_terminate) so that these scripts exit cleanly
|
2021-03-17 13:09:54 -04:00 |
|
Isaac Connor
|
284fe52b5f
|
fix double stop/free of decoder and analysis threads
|
2021-03-17 12:57:45 -04:00 |
|
Isaac Connor
|
c39ec5873b
|
don't include zm_utils in decoder_thread
|
2021-03-17 12:50:13 -04:00 |
|
Isaac Connor
|
2b34d09b84
|
Move analysis_thread into Monitor. Don't do extra gettimeofday if no delays are set. Fix status update on terminate
|
2021-03-17 12:49:50 -04:00 |
|
Isaac Connor
|
feafaa29bf
|
improve debug logging
|
2021-03-17 12:49:12 -04:00 |
|
Isaac Connor
|
6ab8bee581
|
Increase debug level for fifo writing
|
2021-03-17 12:48:59 -04:00 |
|
Isaac Connor
|
0b4f04c4d5
|
notify in clear before taking lock to increase chance of other threads exiting. Handle terminate case in get_packet
|
2021-03-17 12:48:42 -04:00 |
|
Isaac Connor
|
9ca5f49d82
|
Move analysis_thread into Monitor
|
2021-03-17 12:48:08 -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
|
a8d31ca686
|
After moving analysis thread into monitor, I don't know how to handle the shared_ptr stuff
|
2021-03-17 12:46:55 -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
|
6a2e237902
|
Fix delete packet before deleting lock on packet
|
2021-03-17 10:07:03 -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
|
14ef8336b9
|
If ffmpeg and decoding Disabled don't stream
|
2021-03-16 20:10:00 -04:00 |
|
Isaac Connor
|
fe17d7bb23
|
Add checks for aliveness of monitor in streaming. If decoding disabled can't view stream.
|
2021-03-16 20:09:14 -04:00 |
|
Isaac Connor
|
1daafd7f85
|
add GetType
|
2021-03-16 20:08:08 -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
|
8fa989f8e9
|
Increase debug level of input selection
|
2021-03-16 20:07:06 -04:00 |
|
Isaac Connor
|
c0242e7369
|
Fix memleak when connect fails
|
2021-03-16 13:28:00 -04:00 |
|
Isaac Connor
|
028f2dd626
|
Debug extra error log and code style
|
2021-03-16 13:27:27 -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
|
ebf1b7cbdc
|
Only output to stdout if mTerminalLevel is something. zms for example SHOULD not output to stdout, ever except maybe when running from terminal to debug
|
2021-03-16 13:26:06 -04:00 |
|
Isaac Connor
|
28700fd56b
|
Implement saving DecodingEnabled from function view
|
2021-03-16 12:09:14 -04:00 |
|
Isaac Connor
|
9d239219de
|
Break out early if no more buffer. Saves a couple cycles
|
2021-03-16 12:08:45 -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
|
2b0e3d0d2c
|
Merge branch 'decoder_thread'
|
2021-03-15 17:05:36 -04:00 |
|
Isaac Connor
|
9903e909af
|
Rework locking in ZMPacket by using a new class called ZMLockedPacket.
|
2021-03-15 17:05:30 -04:00 |
|
Isaac Connor
|
baf73fea7b
|
Ensure that we disconnect when ShmValid fails
|
2021-03-15 15:11:12 -04:00 |
|
Isaac Connor
|
6a11b23aaf
|
Add decoder thread
|
2021-03-15 15:08:59 -04:00 |
|
Isaac Connor
|
b238a2bc25
|
Implement decoder thread, locking is broken
|
2021-03-15 15:08:43 -04:00 |
|
Isaac Connor
|
feec631ca5
|
Only save updated DiskSpace if event is finished
|
2021-03-15 15:02:43 -04:00 |
|
Isaac Connor
|
f4e60be444
|
If we failed to bind libvnc then fail Prime to prevent crash
|
2021-03-14 22:08:48 -04:00 |
|
Isaac Connor
|
7db3895458
|
Fix default user creation after we added HomeView column
|
2021-03-14 20:11:13 -04:00 |
|
Isaac Connor
|
e0d54a6d11
|
remove deprecated reset and tidy up a bit
|
2021-03-13 16:30:41 -05:00 |
|
Isaac Connor
|
2a6621959c
|
We CANNOT specify nextId for the next mid to use. If we do that then we can overwrite existing db entries
|
2021-03-13 12:47:05 -05:00 |
|
Isaac Connor
|
478d11e6f2
|
Update the auth in streamCmdParams on every request. It wasn't picking up updates
|
2021-03-13 12:12:20 -05:00 |
|
Isaac Connor
|
0bb4afa0bc
|
The test for xmlhttprequest is bogus. chrome jquery JSON requests don't send it. Replace with a test for instead. So now only redirect on proper html views.
|
2021-03-13 12:11:55 -05:00 |
|
Isaac Connor
|
5eae1c0a9f
|
spacing, add code comment
|
2021-03-13 12:10:55 -05:00 |
|
Isaac Connor
|
587cebecbb
|
navbar requests don't pass an auth token so we never send an auth update. Just always send it.
|
2021-03-13 12:10:35 -05:00 |
|
Isaac Connor
|
9d33688f89
|
Honour various permissions on what's in the navbar.
|
2021-03-12 11:40:46 -05:00 |