ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,688 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

18688 Commits

Author SHA1 Message Date
Isaac Connor ffd6928292
Merge pull request #3208 from Carbenium/analysis-thread-cleanup 
Analysis and decoder thread to auto ptr
 2021-04-06 09:38:35 -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 a5f0945306
Merge pull request #3205 from Carbenium/utils-cleanup 
Cleanup zm_utils and add unit tests
 2021-04-03 20:02:15 -04:00
Peter Keresztes Schmidt e92125afd9 utils: remove unused curl include 2021-04-04 01:18:34 +02:00
Peter Keresztes Schmidt b5f3682d4e utils: some more reshuffling/grouping and formatting 2021-04-04 01:18:34 +02:00
Peter Keresztes Schmidt 545f0dbb96 utils: cleanup Base64Encode 2021-04-04 00:39:40 +02:00
Peter Keresztes Schmidt e330f8553d utils: cleanup Split and Join 2021-04-04 00:30:18 +02:00
Peter Keresztes Schmidt 39a896f5b6 utils: cleanup StartsWith 2021-04-03 23:51:12 +02:00
Peter Keresztes Schmidt 3dbf13e00b utils: cleanup ReplaceAll 2021-04-03 23:50:35 +02:00
Peter Keresztes Schmidt 664cd649f8 utils: cleanup Trim (was trimSet) and TrimSpaces 2021-04-03 23:30:59 +02:00
Peter Keresztes Schmidt 3968a411a0 tests/utils: Add tests for QueryString 2021-04-03 22:37:44 +02:00
Peter Keresztes Schmidt fa7c420442 tests/utils: Add tests for UriDecode 2021-04-03 22:37:44 +02:00
Peter Keresztes Schmidt 46a4b615c8 tests/utils: Add tests for base64Encode 
Test vectors according to RFC4648
 2021-04-03 22:37:44 +02:00
Peter Keresztes Schmidt bbc4afcf1b tests/utils: Add tests for join 2021-04-03 22:37:44 +02:00
Peter Keresztes Schmidt e54c10fdb4 tests/utils: Add tests for StringVector split(const std::string&, const std::string&, int limit=0) 2021-04-03 22:37:44 +02:00
Peter Keresztes Schmidt 64cf69ebc1 tests/utils: Add tests for int split(const char*, const char, std::vector<std::string>&) 2021-04-03 22:37:44 +02:00
Peter Keresztes Schmidt bde0bde066 tests/utils: Add tests for startsWith 2021-04-03 22:35:03 +02:00
Peter Keresztes Schmidt 13f91b5826 tests/utils: Add tests for replaceAll 2021-04-03 22:35:03 +02:00
Peter Keresztes Schmidt 6150ceeb17 tests/utils: Add tests for trimSpaces 2021-04-03 22:35:03 +02:00
Peter Keresztes Schmidt 4529e59b1d tests/utils: Add tests for trimSet 2021-04-03 22:35:03 +02: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 36838b70dc Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-04-01 12:22:35 -04:00
Isaac Connor cc33718a2e fix did you forget to declare my $deleteLogByRowsSth?) 2021-04-01 12:22:30 -04:00
Isaac Connor 8aceccd496 improve the message when max video packets is exceeded 2021-04-01 11:53:57 -04:00
Isaac Connor 2d64c616ba Add help for BadEncoderParameters 2021-04-01 11:53:57 -04:00
Isaac Connor 73082a2d33 Remove the H264/X264 from the dropdown labels. Could be H265 or other 2021-04-01 11:53:57 -04:00
Isaac Connor ba9acd3037 Add test for no encoder settings 2021-04-01 11:53:57 -04:00
Isaac Connor 7e3d6f867e Set the default crf so that encoding works 2021-04-01 11:53: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 6459cfb4bc introduce packetqueue::unlock to unlock packets and notify anyone waiting. Also check for iterators pointing to packets when not keeping keyframes. Loop with waiting when we can't lock a packet 2021-04-01 11:52:28 -04:00
Isaac Connor f52ead7cda introduce packetqueue::unlock to unlock packets and notify anyone waiting. Also check for iterators pointing to packets when not keeping keyframes. Loop with waiting when we can't lock a packet 2021-04-01 11:52:25 -04:00
Isaac Connor 1c9bc5c27f code doc and spacing 2021-04-01 11:51:18 -04:00
Isaac Connor 137f7aad6b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-04-01 09:28:02 -04:00
Isaac Connor 1fd9361e4e use zmDbDo to replace many lines of code 2021-04-01 09:27:49 -04:00
Isaac Connor 757ec2dbc1 Improve zmDbDo to return rows affected instead of boolean 2021-04-01 09:27:20 -04:00
Isaac Connor 80e5076d2a cache bust jquery and bootstrap 2021-03-31 18:27:43 -04:00
Isaac Connor 22d713cd9c fix packetqueue corruption. Can't wait after grabbing the packet. 2021-03-31 16:49:19 -04:00
Isaac Connor ddb62a27c6 Fix queue full message. Remove test for empty queue. We don't care if the queue is empty. Improve debug logging. 2021-03-31 16:49:19 -04:00
Isaac Connor fd23b3e284 Adjust debug levels 2021-03-31 16:49:19 -04:00
Isaac Connor 9af97c50aa Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2021-03-31 12:40:35 -04:00
Isaac Connor c8e9c3dd83 Spacing, remove redundant public: 2021-03-31 12:40:02 -04:00
Isaac Connor c3ce9913cf Upgrade cakephp to 2.10.24 2021-03-31 12:11:12 -04:00
Isaac Connor c73393579d Handle event creation failing gracefullyish 2021-03-31 12:06:33 -04:00
Isaac Connor eed6a57800 remove unused member sd 2021-03-31 12:06:14 -04:00
Isaac Connor 9b4eee02d8 Make sure id is initialized to 0 so that we can test if event creation worked 2021-03-31 12:06:03 -04:00
Isaac Connor 4fb73505b9 backport change to not initialize db in logger which fixes small memleak. 2021-03-31 12:05:30 -04:00