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 |
|
Isaac Connor
|
e5f9654e50
|
honour Groups:View permission in monitor filters
|
2021-03-12 11:33:16 -05:00 |
|
Isaac Connor
|
62cfdd8d61
|
fix searching in snapshots
|
2021-03-12 10:52:23 -05:00 |
|
Isaac Connor
|
b50916e02a
|
Allow unknown columns in filters. Allow specifying the table name in FilterTerm.
|
2021-03-12 10:52:10 -05:00 |
|
Isaac Connor
|
9504d8be61
|
event_ids => snapshot_ids
|
2021-03-12 10:40:23 -05:00 |
|
Isaac Connor
|
1ae1a89abf
|
Only allow show zones for System::View permission
|
2021-03-12 10:29:13 -05:00 |
|
Isaac Connor
|
ba00bee4b8
|
fix header alignment
|
2021-03-12 10:07:33 -05:00 |
|
Isaac Connor
|
70073ea017
|
Add thumbnails to snapshots list
|
2021-03-12 10:07:17 -05:00 |
|
Isaac Connor
|
527defc0c8
|
Bump version to 1.35.21 for Snapshots
|
2021-03-12 09:28:47 -05:00 |
|
Isaac Connor
|
11c2318a05
|
Rough in the ui for Snapshots
|
2021-03-12 09:28:05 -05:00 |
|
Isaac Connor
|
c9170a87b2
|
Allow users with Monitors::View to generate and cancel events
|
2021-03-12 09:26:56 -05:00 |
|
Isaac Connor
|
6682ec7da5
|
Add Snapshots and Snapshot_Events Tables. Add HomeView to Users.
|
2021-03-12 09:26:23 -05:00 |
|
Isaac Connor
|
620806a1bf
|
Add Snapshots and Snapshot_Events Tables. Add HomeView to Users.
|
2021-03-12 09:26:13 -05:00 |
|
Isaac Connor
|
786adc5511
|
Spacing
|
2021-03-11 13:48:52 -05:00 |
|
Isaac Connor
|
28490816dc
|
Use new zmDbDoUpdate to end the event
|
2021-03-11 13:48:42 -05:00 |
|
Isaac Connor
|
cbec5b2800
|
Implement zmDbDoUpdate which returns -mysql_errer or # of rows modified
|
2021-03-11 13:48:16 -05:00 |
|
Isaac Connor
|
b5f45b0987
|
fix alignment of help
|
2021-03-11 13:16:44 -05:00 |
|
Isaac Connor
|
86a26ef3b1
|
nvsnprintf won't exceed the buffer but it can hit the end of it so adding the ending ]\n can overflow. Test and prevent.
|
2021-03-11 13:16:32 -05:00 |
|
Isaac Connor
|
43e7e612c5
|
Have to turn off DB logging when logging from a db query or else we infinite loop
|
2021-03-11 13:07:47 -05:00 |
|
Isaac Connor
|
f2553220b6
|
Implement xop::Authenticator::GetFailedResponse to return a 401
|
2021-03-11 11:45:39 -05:00 |
|
Isaac Connor
|
874e61d681
|
remove Base64 include from live555
|
2021-03-11 09:26:50 -05:00 |
|
Isaac Connor
|
0da9ee2e4c
|
Remove live555 detection
|
2021-03-11 08:08:01 -05:00 |
Isaac Connor
|
644d6d34a4
|
Must init video_stream_id and audio_stream_id
|
2021-03-10 17:23:44 -05:00 |
|
Isaac Connor
|
5d968358f7
|
Need to use ZM::make_unique because std::make_unique is c++14
|
2021-03-10 16:35:03 -05:00 |