Commit Graph

53 Commits

Author SHA1 Message Date
Isaac Connor 01834d4ddc finish converting Capture to std::shared_ptr 2021-05-09 07:35:47 -04:00
Peter Keresztes Schmidt 68bedfe48f Fix logging format string mismatches
* Remove SZFMTD format macro and use %zu instead for size_t. %zu is understood by every compiler nowadays.
2021-04-30 00:26:24 +02:00
Peter Keresztes Schmidt e330f8553d utils: cleanup Split and Join 2021-04-04 00:30:18 +02:00
Peter Keresztes Schmidt 664cd649f8 utils: cleanup Trim (was trimSet) and TrimSpaces 2021-04-03 23:30:59 +02:00
Peter Keresztes Schmidt c7f9cc3368 LibvlcCamera: Convert ThreadData with std::condition_variable 2021-03-03 23:31:53 +01:00
Isaac Connor b87d859f72 Set the packet's stream_index to the packetqueue stream. Rename get_ functions to get 2021-03-03 12:06:34 -05:00
Isaac Connor a5ad7462e0 add dlclose 2021-02-19 20:41:41 -05:00
Peter Keresztes Schmidt f43507dce0 Use the power of smart pointers to manage Monitor instances 2021-02-07 21:20:45 +01:00
Peter Keresztes Schmidt 0dbc39ee25 Cleanup and reorganize includes
With this commit a unified structure for includes is introduced.
The general rules:
 * Only include what you need
 * Include wherever possible in the cpp and forward-declare in the header

 The includes are sorted in a local to global fashion. This means for the include order:
  0. If cpp file: The corresponding h file and an empty line
  1. Includes from the project sorted alphabetically
  2. System/library includes sorted alphabetically
  3. Conditional includes
2021-02-04 18:02:01 +01:00
Isaac Connor a39a656373 Merge branch 'master' into zma_to_thread 2020-09-29 11:02:40 -04:00
Peter Keresztes Schmidt 8f980a1168 Convert NULL/0 to nullptr
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
Isaac Connor 869860bb26 Merge branch 'master' into zma_to_thread 2020-07-21 17:49:39 -04:00
Isaac Connor 7575afc8d5 Merge branch 'master' into zma_to_thread 2020-07-21 17:38:32 -04:00
Isaac Connor 9b05337e57 Priming capture logs should be debug level, especially if they ar egoing to log passwords 2020-07-13 15:03:04 -04:00
hax0kartik 143ad394a9 Dynamically load libvlc 2020-04-14 00:15:06 +05:30
Isaac Connor a9e2011727 Merge branch 'storageareas' into zma_to_thread 2019-02-13 12:24:38 -05:00
Isaac Connor ae1f00f2a1 add a logging callback to the libvlc camera 2019-01-08 13:06:19 -05:00
Isaac Connor c3053a2f8a Merge branch 'storageareas' into zma_to_thread 2018-05-10 17:51:38 -04:00
Isaac Connor d31b33ffc6 add a code comment 2018-05-07 11:08:06 -04:00
Isaac Connor 8ed015966b add zm_terminate to main while loop 2018-05-07 10:27:26 -04:00
Isaac Connor bcdadc67bf Merge branch 'storageareas' into zma_to_thread 2017-12-12 15:29:19 -05:00
Isaac Connor 8c1159ad56 quiet coverity by initializing everything in constructor 2017-12-12 12:37:36 -05:00
Isaac Connor 74650ebc70 simplify Analysis 2017-11-20 11:48:56 -05:00
Isaac Connor 64816aa005 fixes from cppcheck. 2017-11-18 16:00:10 -05:00
Isaac Connor 0e7f475ce8 merge work from zma_to_thread, but not the zma_to_thread part 2017-11-12 11:42:34 -05:00
Isaac Connor cab8c4cd5e cleanup Monitor::Capture. Cleanup the return values from Capture and CaptureAndRecord. <0 is error, 0 is things ok, but no video frame. > 0 means we have a frame. Plus google code style 2017-11-03 13:49:42 -04:00
Isaac Connor fd44ff4e60 Merge branch 'master' into storageareas 2017-05-10 13:16:08 -04:00
Kfir Itzhak 71e6735b60 Neon32 functions now work on 64 bytes at a time. This results in 4-6x performance increase over standard functions
Memory allocations and image size requirements changed to be as needed for 64 byte alignment.
Self-test code for Blend modified accordingly and added Self-test for the delta functions.
2017-04-16 10:57:37 +03:00
Isaac Connor 59c85c1fbb change bool recording to a timeval. 2017-04-12 13:38:39 -04:00
Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor 824d7c5b43 Merge ../ZoneMinder.Steve into packetqueue 2016-08-31 11:58:22 -04:00
Isaac Connor 55c6e5a6db cleanup putting packetqueue in the monitor. It should be in the camera 2016-08-31 11:47:42 -04:00
Isaac Connor 6a8db582ff whitespacing updates 2016-06-21 12:21:18 -04:00
Steve Gilvarry 0abfb7378a Buffer work 2016-05-18 00:01:33 +10:00
Steve Gilvarry da157f5a1a Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-04-30 22:27:10 +10:00
Isaac Connor 9a795432cf merge all the commits from the messed up iconnor_video branch 2016-04-05 17:14:46 -04:00
Isaac Connor 03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
Isaac Connor c26dbb9028 rough in record_audio, and do lots of whitespace cleanups 2016-03-31 12:54:56 -04:00
SteveGilvarry 0e4156c095 Add CaptureAndRecord to vlc, still need to make it record 2014-10-23 19:56:35 +11:00
m-bene a81b9b8ce2 change examples for options 2014-05-17 21:48:08 +02:00
m-bene f62afdb8cc add select list for rtsp method for ffmpeg and libvlc 2014-05-17 20:41:22 +02:00
m-bene 9a71a0068a add help window for ffmpeg/libvlc options 2014-05-17 04:33:33 +02:00
m-bene 5cb7cd916f add quotes to option debug/warn messages 2014-05-15 15:13:39 +02:00
m-bene c1557a99e5 add debug and warn messages 2014-05-15 15:06:01 +02:00
m-bene ae0ee9b3b3 testing/fixing 2014-05-05 15:54:13 +02:00
m-bene ceff5a98ea add generic Option field to ffmpeg and libvlc cameras 2014-05-05 13:29:12 +02:00
Edward Barnard 6c94308ba0 Fix bug in frame difference checker. 2013-12-22 01:06:12 +00:00
Edward Barnard 3e2647782d Better error handling 2013-12-19 23:10:45 +00:00
Edward Barnard f4d72752a8 Check for frame differences as libvlc provides frames at a constant 15fps even if they are duplicates 2013-12-19 23:02:21 +00:00