Isaac Connor
|
e8622b68dc
|
whitespace, delete dead code
|
2018-11-29 13:17:41 -05:00 |
|
Isaac Connor
|
9cbc3352b9
|
Implement an error count. Return -1 when it gets over 100 so that the camera will be reopened.
|
2018-11-29 13:09:29 -05:00 |
|
Isaac Connor
|
af501128f2
|
fix invalid use of %s. Pass the buffer as the format string instead of a ... param
|
2018-11-29 10:54:01 -05:00 |
Isaac Connor
|
d4acc9e205
|
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
|
2018-11-29 10:24:58 -05:00 |
|
Isaac Connor
|
4625f7c879
|
Merge branch 'master' into storageareas
|
2018-11-28 10:46:49 -05:00 |
|
Isaac Connor
|
8404f0ef64
|
When forcing an alarm, print out the event id
|
2018-11-26 16:21:32 -05:00 |
|
Isaac Connor
|
251ccc0ba9
|
remove extra ()
|
2018-11-26 16:20:52 -05:00 |
|
Isaac Connor
|
817a760559
|
send logPrint a pre-formatted string
|
2018-11-23 13:04:20 -05:00 |
|
Isaac Connor
|
c89bb8bc16
|
Merge branch 'av_logging' into storageareas
|
2018-11-23 12:46:27 -05:00 |
|
Isaac Connor
|
522ecaddd8
|
remove extra include unistd.h and we have to pre-define RecursiveMutex because we use it in zm_logger.
|
2018-11-23 12:46:10 -05:00 |
|
Isaac Connor
|
4d4666f5e0
|
add a mutex in logging functions so that multiple threads can log at the same time
|
2018-11-23 12:45:41 -05:00 |
|
Isaac Connor
|
61759a1f2d
|
older libavcodecs don't have AV_LOG_TRACE AND AV_LOG_MAX_OFFSET
|
2018-11-23 12:45:21 -05:00 |
|
Isaac Connor
|
af8626158d
|
zm_exception doesn't use anything from zm.h so don't include it
|
2018-11-23 12:44:54 -05:00 |
|
Isaac Connor
|
48564da915
|
zm_config.h shouldn't include zm.h. zm.h includs zm_config.h
|
2018-11-23 12:44:34 -05:00 |
|
Isaac Connor
|
5ad753b6b4
|
zm_comms uses logging functions, so include zm_logger.h
|
2018-11-23 12:44:10 -05:00 |
|
Isaac Connor
|
9241c26f2f
|
Move PATH_MAX to zm_config where all the other defines are
|
2018-11-23 12:43:51 -05:00 |
|
Isaac Connor
|
dea5db9dd9
|
Merge branch 'zmaudit_check_other_storageareas' into storageareas
|
2018-11-23 11:11:39 -05:00 |
|
Isaac Connor
|
87140ecdb5
|
white space and quiet warning
|
2018-11-17 10:39:42 -05:00 |
|
Isaac Connor
|
64ce035129
|
Merge branch 'av_logging' into storageareas
|
2018-11-14 17:03:32 -05:00 |
|
Isaac Connor
|
70d9fda758
|
Implement a logging callback for avcodec to use our logging functions
|
2018-11-14 17:02:52 -05:00 |
|
Isaac Connor
|
9d5772b517
|
Merge branch 'fix_multiserver_daemon_restarting' into storageareas
|
2018-11-14 13:02:30 -05:00 |
|
Isaac Connor
|
35b439629c
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-13 18:14:35 -05:00 |
|
Isaac Connor
|
5120c6f540
|
remove compile warning by assigning AV_CODEC_NONE to the codec_id.
|
2018-11-13 18:13:55 -05:00 |
|
Isaac Connor
|
73c52705f2
|
Merge branch 'fix_32bit_alignment' into storageareas
|
2018-11-13 14:22:06 -05:00 |
|
Isaac Connor
|
e8ed1367d7
|
Merge branch 'master' into storageareas
|
2018-11-13 14:22:00 -05:00 |
|
Isaac Connor
|
31b0ed107d
|
remove epadding2, to restore the 64bit alignment of startup_time. A proper fix instead of #2258
|
2018-11-13 14:02:44 -05:00 |
|
Isaac Connor
|
a95a012fa5
|
fix #2302
|
2018-11-12 11:56:18 -05:00 |
|
Isaac Connor
|
230ce61dc4
|
fix #2296 by prepending bind with ::
|
2018-11-07 11:54:18 -05:00 |
|
Isaac Connor
|
be0767b4cd
|
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
|
2018-11-06 15:27:17 -05:00 |
|
Isaac Connor
|
5a933a93c2
|
clean up static vars and google code style
|
2018-11-06 15:27:10 -05:00 |
|
Isaac Connor
|
6d6d25261f
|
Merge branch 'zmrecover' into storageareas
|
2018-11-06 12:14:54 -05:00 |
|
Isaac Connor
|
d973d55d2f
|
Use SaveJPEGs from the Event record instead of the Monitor Object
|
2018-11-06 11:45:34 -05:00 |
|
Isaac Connor
|
09fab280ea
|
SOCKS dir creation logs should be debug
|
2018-11-02 10:57:47 -04:00 |
|
Isaac Connor
|
17c091f9f9
|
Google code style and add a debug showing the # of addresses in hp
|
2018-11-02 10:26:39 -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
|
ed50856d40
|
Merge branch 'master' into storageareas
|
2018-10-24 13:45:54 -04:00 |
|
Isaac Connor
|
bca2b30518
|
Add a test for channel layout and correct it if not set
|
2018-10-24 13:45:33 -04:00 |
|
Isaac Connor
|
c48ce09068
|
Turn back on ffmpeg debug logging
|
2018-10-24 13:11:09 -04:00 |
|
Isaac Connor
|
15f89c4b50
|
Turn ffmpeg logging back on
|
2018-10-24 12:44:14 -04:00 |
|
Isaac Connor
|
ca8770bd5a
|
Merge branch 'fix_rce' into storageareas
|
2018-10-24 10:17:16 -04:00 |
|
Isaac Connor
|
0f14df64e2
|
google code style and whitespace
|
2018-10-22 10:41:27 -04:00 |
|
Isaac Connor
|
17726bbe38
|
Actually say how big the ImageBufferCOunt should be
|
2018-10-17 17:19:27 -04:00 |
|
Isaac Connor
|
c2af380e29
|
Merge branch 'master' into storageareas
|
2018-10-16 11:39:26 -04:00 |
|
Isaac Connor
|
5fce783b65
|
Merge branch 'smarter_packetqueue' into storageareas
|
2018-10-15 11:34:05 -04:00 |
|
Isaac Connor
|
990c4b1b45
|
Add a warning when there are more videoframes in the packetqueue than image_buffers
|
2018-10-15 11:33:58 -04:00 |
|
Isaac Connor
|
dae31d226b
|
add GetImageBufferCount to monitor
|
2018-10-15 11:33:16 -04:00 |
|
Isaac Connor
|
33c903a644
|
properly initialize packet_counts
|
2018-10-15 11:13:10 -04:00 |
|
Isaac Connor
|
7149576a7c
|
Merge branch 'smarter_packetqueue' into storageareas
|
2018-10-15 10:59:50 -04:00 |
|
Isaac Connor
|
45a1a1b1e8
|
Make packetqueue keep track of audio vs video packet counts.
|
2018-10-15 10:51:56 -04:00 |