mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-17 13:27:46 -04:00
Code Issues Packages Projects Releases Wiki Activity
19,489 Commits 80 Branches 104 Tags
9d37fbcd8e7e66e76396200df8e757548aeed668
Commit Graph

83 Commits

Author SHA1 Message Date
Isaac Connor
848a537a0f Fix zms giving 500 code instead of displaying error image due to not having sent the headers yet. 2021-08-23 18:10:31 -04:00
Isaac Connor
1766bbdfcd Handle the case when the monitor doesn't exist more gracefully and not crash. Fixes #3316 2021-07-08 10:07:01 -04:00
Peter Keresztes Schmidt
e1fe53338c BaseStream: Convert internals to std::chrono 2021-06-13 11:29:59 +02:00
Peter Keresztes Schmidt
a9ad5c5eee Build: Promote libavcodec to a required dependency 
FFmpeg is an integral component of ZM. Promote the appropriate libraries to required dependencies.
This reduces the possible build configurations greatly and thus maintenance burden.
 2021-06-05 14:25:54 +02:00
Peter Keresztes Schmidt
8f685b3d66 Box+Poly: Remove direct accessors to {Hi,Lo}{X,Y} 2021-05-16 16:42:58 +02:00
Peter Keresztes Schmidt
f85e3765db Box: Remove unnecessary constructors 2021-05-16 16:42:58 +02: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
Isaac Connor
cfe51d7349 Disconnect if we call loadMonitor a second time. 2021-04-12 15:59:31 -04:00
Isaac Connor
1bfc61a5b7 change log level to debug when monitor is not decoding 2021-03-23 10:32:59 -04:00
Isaac Connor
14ef8336b9 If ffmpeg and decoding Disabled don't stream 2021-03-16 20:10:00 -04:00
Isaac Connor
c0242e7369 Fix memleak when connect fails 2021-03-16 13:28:00 -04:00
Peter Keresztes Schmidt
d9568a98c0 Drop zm_thread which has been replaced by STL implementations 2021-03-04 10:55:46 +01:00
Peter Keresztes Schmidt
f43507dce0 Use the power of smart pointers to manage Monitor instances 2021-02-07 21:20:45 +01:00
Isaac Connor
7f99635763 Fix xenial builds. Fixes #3130 2021-02-05 12:30:51 -05: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
d6345d32fd Reduce error level of warnings about monitors having Function==NONE 2020-11-25 09:53:06 -05:00
Isaac Connor
e1a0c4f973 Don't log a warning of comms not open if no connkey 2020-11-20 16:31:12 -05:00
Isaac Connor
cb38242917 use nullptr when appropriate 2020-10-08 16:46:47 -04:00
Isaac Connor
71085d9724 Clear the textframe before Annotating it. 2020-10-05 13:16:22 -04:00
Isaac Connor
f3873d65e4 remove debug 2020-09-02 17:33:38 -04:00
Isaac Connor
ea3fcb16a6 Changes to not just die if not connected to monitor. Instead wait around spitting out an error image. 2020-09-02 16:36:05 -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
e21ffbea7d Merge branch 'fix_zms' 2020-04-26 18:43:39 -04:00
Isaac Connor
ae9a5766f5 Merge branch 'release-1.34' into fix_zms 2020-04-26 18:19:30 -04:00
Isaac Connor
c6c8a23c02 sun_path is defined to be 108 bytes. No need for 4095. Quiets compiler warnings 2020-04-24 18:03:00 -04:00
Isaac Connor
ffed88454f Provide a more useful error message when the monitor's function is set to NONE. Fixes #2877 2020-03-09 13:14:09 -04:00
Isaac Connor
492be7cc33 make last_zoom last_scale last_x and last_y members of the StreamBase object instead of static vars so that we can access them in monitorStream 2019-09-26 13:51:49 -04:00
Isaac Connor
09934ed7f5 Fix sendTextFrame 2019-07-26 12:21:25 -04:00
Isaac Connor
8417230690 debug where the comms sock is 2019-03-18 10:55:08 -04:00
Isaac Connor
9b713a489d fix sleep time by using a comparison between the frame display time and the distance between now and when we started playing. 
handle infinite fps
 2019-03-06 14:50:36 -05:00
Isaac Connor
6c8eac1ac8 Merge branch 'storageareas' into h265 2019-03-06 11:10:01 -05:00
Isaac Connor
abfb5642c8 cleanup and document updateFrameRate 2019-03-06 09:46:28 -05:00
Isaac Connor
95567e07a4 Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2019-02-26 11:43:07 -05:00
Isaac Connor
7260f823cb Merge branch 'master' into storageareas 2019-01-21 13:52:38 -05:00
Isaac Connor
a81428f701 add a test for a 0 fps passed in to updateFrameRate which would cause an infinite loop. Fixes #2427 2019-01-21 13:30:00 -05:00
Isaac Connor
87d1390fed Merge branch 'storageareas' into h265 2019-01-16 15:20:17 -05:00
Isaac Connor
84c812725e spacing, improve debug. WHen looking for starting keyframe in packetqueue, use <= instead of <. 2019-01-14 14:00:45 -05:00
Isaac Connor
bc5f8d0d8d rework pts/dts of audio stream. Spacing. Fix crash 2018-12-04 18:23:08 -05:00
Isaac Connor
e24a308481 Merge branch 'master' into h265 2018-11-14 17:15:37 -05:00
Isaac Connor
e8ed1367d7 Merge branch 'master' into storageareas 2018-11-13 14:22:00 -05:00
Isaac Connor
230ce61dc4 fix #2296 by prepending bind with :: 2018-11-07 11:54:18 -05:00
Isaac Connor
09fab280ea SOCKS dir creation logs should be debug 2018-11-02 10:57:47 -04:00
Isaac Connor
33235a19ba Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2018-10-28 15:11:32 -04:00
Isaac Connor
9e999294df Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2018-10-28 15:09:32 -04:00
Isaac Connor
a8329465fb Merge branch 'master' into h265 2018-10-22 10:30:01 -04:00
Andrew Bauer
c7f9ffa521 Merge pull request #2217 from connortechnology/touch_lockfile 
Touch lockfile
 2018-10-11 08:45:09 -05:00
Isaac Connor
53057eae25 Always make SOCK_DIR as it may not exist due to running under systemd and being chrooted 2018-09-23 16:51:06 -04:00
Isaac Connor
c8549e41da touch the zms lock file every hour so that we can determine which ones are stale 2018-09-21 15:58:14 -04:00
Isaac Connor
0ec391354c Merge branch 'fix_zms_from_mp4' into h265 2018-09-13 16:18:28 -04:00
Isaac Connor
498435886f improve debug message 2018-09-11 13:22:35 -04:00