Commit Graph

73 Commits

Author SHA1 Message Date
hax0kartik 528699f942 Use ctzll + new font format for improving drawing speed 2020-11-28 18:46:20 +05:30
Peter Keresztes Schmidt 06dfe9b987 Extract generated part of zm_config.h into zm_config_data.h
With this change IDEs have it easier to correctly reference the
variable/class declarations. Additionally one does not have to
regenerate the zm_config.h file when changing the code.
2020-08-25 23:33:56 +02:00
dmo ed496e74fc
Update CMakeLists.txt 2020-08-07 07:54:58 +02:00
hax0kartik 1d3ad05bb5 Start implementing VNC 2020-03-25 23:21:34 -07:00
Daniel Schaefer 158b9438d7 Explicitly link with libdl (#2649)
Otherwise on some systems linking would fail with

  undefined reference to symbol 'dlclose@@GLIBC_2.2.5'
2019-06-27 15:08:29 -04:00
Andrew Bauer 00183b535a rename bcrypt to libbcrypt to reflect name of the project 2019-06-23 12:56:04 -05:00
Andrew Bauer 8b37c0e9b0 remove bcrypt & jwt-cpp as submodules, bring in statically under src 2019-06-23 12:12:12 -05:00
Pliable Pixels 06eb9a3bb2 merge typo 2019-05-16 16:15:16 -04:00
Pliable Pixels 915e9f05a9 merged fifo changes 2019-05-16 16:14:06 -04:00
Mitch Capper eb005e8b9c FIFO support for zoneminder zone debugging (#2594)
Adds fifo options for diagnostic images for much lower impact diagnostics mode.  Diagnostic images are only written when there is a client listening for them (otherwise they are skipped).  Also added a json stream for the detection data so you can see in real time the pixels or blobs detected for the motion.  This allows for easy real time stream of both delta and reference images (as video streams) along with the detection numbers.
2019-05-16 15:37:03 -04:00
Pliable Pixels 2212244882 fix absolute path 2019-05-08 15:47:38 -04:00
Pliable Pixels d952fe7117 Moved to openSSL SHA1, initial JWT plugin 2019-05-04 11:52:53 -04:00
Pliable Pixels 72325d12b7 move to wrapper 2019-05-03 11:40:35 -04:00
Pliable Pixels 45b7814124 absolute path 2019-05-01 14:33:36 -04:00
Pliable Pixels 65a57feedb absolute path 2019-05-01 14:30:00 -04:00
Pliable Pixels c663246f0a try add_library instead 2019-05-01 14:22:10 -04:00
Pliable Pixels ca24b504d4 fixed typo 2019-05-01 13:46:54 -04:00
Pliable Pixels 8bbddadc12 put link_dir ahead of add_executable 2019-05-01 13:43:41 -04:00
Pliable Pixels 07be830f94 added bcrypt to others 2019-05-01 13:35:18 -04:00
Pliable Pixels dd63fe86ce add sha source 2019-05-01 13:28:39 -04:00
Pliable Pixels ddb7752226 added include path 2019-05-01 13:24:50 -04:00
Pliable Pixels c4b1bc19e0 added bcrypt and sha to src build process 2019-05-01 13:15:07 -04:00
Isaac Connor 0bfe1007c8 Merge branch 'master' into storageareas 2018-12-14 10:16:08 -05:00
Andrew Bauer db81465fa2 allow one to set manpage destination 2018-12-07 09:47:00 -06:00
Isaac Connor ab9081e1bf create a simple Frame class. Add a queue of Frames to the Event. When we get 10 of them write them out to the db. 2018-12-05 13:18:21 -05:00
Isaac Connor eea58091c8 add groups 2018-05-02 12:20:36 -07:00
APHW2 MFGENG 354262c557 wip nvsocket 2017-10-03 13:28:56 -07:00
Isaac Connor ddb7305aab Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-02 09:11:55 -04:00
Isaac Connor a81ff85fbb add ffmpeg decoding of a .mp4 to get the frames 2017-08-23 15:05:44 -04:00
Isaac Connor b73c0ba978 rough in zm_ffmpeg_input and split out eventstream 2017-06-22 17:58:32 -04:00
Isaac Connor fd44ff4e60 Merge branch 'master' into storageareas 2017-05-10 13:16:08 -04:00
Isaac Connor eb390c323e Merge branch 'storageareas' into ffmpeg_321 2017-04-11 11:14:23 -04:00
Isaac Connor 620797ac18 replace swresample with libavresample 2017-04-10 21:54:23 -04:00
Isaac Connor f19b3d5505 create zm_packet 2017-02-18 15:22:56 -05:00
SteveGilvarry 2f3ebd80da Remove zmf, die..die..die 2017-01-16 13:20:05 -08:00
Isaac Connor 824d7c5b43 Merge ../ZoneMinder.Steve into packetqueue 2016-08-31 11:58:22 -04:00
Steve Gilvarry 02013cef94 Merge remote-tracking branch 'upstream/feature-h264-videostorage' into packetqueue 2016-05-03 21:15:46 +10:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor 238a25a302 Merge branch 'master' into iconnor_video 2016-04-05 09:38:59 -04:00
SteveGilvarry 4d7ded5ef0 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
	configure.ac
	src/Makefile.am
	web/js/Makefile.am
2016-04-05 22:06:14 +10:00
SteveGilvarry 966fbb1a10 Add Packet Queue 2016-04-04 20:04:14 +10:00
Isaac Connor aa516dd575 undo the multi-line 2016-03-31 11:24:27 -04:00
Isaac Connor c9a1a9020d Merge h264 2016-03-31 11:03:36 -04:00
SteveGilvarry 0277a66700 Remove eyezm from distros and Cmake.
Conflicts:
	distros/debian8/control
2016-02-26 22:41:27 +11:00
Isaac Connor b2b1afa8ad Merge master 2015-12-14 15:49:32 -05:00
SteveGilvarry d45cf9607b Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2015-10-28 08:12:46 +11:00
baffo32 44cda8032b Install nph-zms with FILES so that it is listed in install_manifest.txt and uninstalled with make uninstall 2015-10-24 20:07:42 -04:00
SteveGilvarry f09a551d6a Merge branch 'master' into feature-h264-videostorage 2015-07-28 21:06:52 +10:00
Isaac Connor 8b2f67c456 don't include .cpp in man 2015-07-13 11:30:32 -04:00
Andy Bauer 561bf43721 fix pod2man generation for out-of-source builds 2015-07-09 19:33:06 -05:00