Isaac Connor
|
56186a42ef
|
change signal_check_points to a per-monitor variable instead of parts of config. Only call SignalCheck if signal_check_points is > 0
|
2018-04-19 10:10:14 -04:00 |
|
Isaac Connor
|
eb21a5113e
|
Add a debug line in SignaCheck function
|
2018-04-19 09:34:14 -04:00 |
|
Isaac Connor
|
bd69f6a2ca
|
close the videoStore when closing FFmpegCamera
|
2018-04-18 15:30:42 -04:00 |
|
Isaac Connor
|
e56cf0b31c
|
switch to uint64_t for event_id because long long can actually be 128 bit
|
2018-04-17 13:57:19 -04:00 |
|
Isaac Connor
|
fd1c69d48a
|
switch to uint64_t for event_id because long long can actually be 128 bit
|
2018-04-17 13:51:20 -04:00 |
|
Isaac Connor
|
3b0282f6ec
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-17 12:32:10 -04:00 |
|
Isaac Connor
|
0198ac832d
|
improve logging around loss of signal and lock around static sql
|
2018-04-17 12:30:58 -04:00 |
Isaac Connor
|
34111251d9
|
Introduce Close() to camera and monitor api. Use it to close a camera when there is an error with capturing. Remove the sleep10 on error.
|
2018-04-17 07:02:52 -07:00 |
|
Isaac Connor
|
0b0fbae1c5
|
Add output of paused image when paused
|
2018-04-12 18:43:57 -04:00 |
|
Isaac Connor
|
f9f78e9aa3
|
Convert event_id to a 64bit unsigned int
|
2018-04-12 13:40:11 -07:00 |
|
Isaac Connor
|
b974b4dcd1
|
google code style, and when paused, don't die after 10 seconds
|
2018-04-12 13:14:00 -04:00 |
|
Isaac Connor
|
2af539e916
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-12 11:39:30 -04:00 |
|
Isaac Connor
|
8518278476
|
coverity scan fixes/cleanups
|
2018-04-12 11:29:35 -04:00 |
|
Isaac Connor
|
c766c1ddd1
|
spacing cleanup
|
2018-04-12 10:28:22 -04:00 |
|
Isaac Connor
|
71d5984eb0
|
delete stream after use
|
2018-04-12 10:26:18 -04:00 |
|
Isaac Connor
|
ea8a132289
|
use swscale's new init function
|
2018-04-12 10:25:06 -04:00 |
|
Isaac Connor
|
65c69d419b
|
google code style and remove throws from constructors and destructors
|
2018-04-12 10:24:47 -04:00 |
|
Isaac Connor
|
c6635b8096
|
make swscale more robust by moving bits that can fail into an init function instead of the constructor
|
2018-04-12 10:24:10 -04:00 |
|
Isaac Connor
|
3130a21a28
|
google code style
|
2018-04-12 10:23:20 -04:00 |
|
Isaac Connor
|
f17c8475be
|
clean up order of declarations
|
2018-04-12 10:23:10 -04:00 |
|
Isaac Connor
|
3b7992a39b
|
converity scan fixes, and close the .mp4 after updating the db record.
|
2018-04-12 10:22:46 -04:00 |
|
Isaac Connor
|
c466f50255
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-11 13:50:50 -07:00 |
|
Isaac Connor
|
989ed65f52
|
spacing and braces, remove a dead unused function
|
2018-04-11 10:50:28 -04:00 |
|
Isaac Connor
|
db0dac6eb2
|
Don't use static sql when multiple threads might be using it
|
2018-04-10 13:06:36 -07:00 |
Isaac
|
06fed41d5a
|
whitespace
|
2018-04-06 23:21:47 +02:00 |
|
Isaac
|
da9d4c2a5c
|
whitespace, don't pre-allocate mFormatContext
|
2018-04-06 23:21:40 +02:00 |
|
Isaac
|
64cfb39043
|
do an initial fps report early on
|
2018-04-06 23:21:22 +02:00 |
|
Isaac
|
d8171750cd
|
only call avformat_close_input if mformatContext still has a value. On falure it should have been freed and NULL'd
|
2018-04-06 23:02:15 +02:00 |
|
Isaac
|
668c515b21
|
remove unused code that doesn't compile
|
2018-04-06 19:48:00 +02:00 |
|
Isaac Connor
|
b9da309904
|
remove spaces
|
2018-04-05 11:33:09 -04:00 |
|
Isaac Connor
|
ec5f955d26
|
more db locking
|
2018-04-05 11:30:14 -04:00 |
|
Isaac Connor
|
fc38fdcc56
|
remove extra spaces
|
2018-04-05 11:30:01 -04:00 |
|
Isaac Connor
|
a493fd4dd7
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-03 17:41:49 -04:00 |
|
Isaac Connor
|
9fde052d39
|
merge
|
2018-04-03 14:41:32 -07:00 |
|
Isaac Connor
|
a1def1dfe9
|
whitespace
|
2018-04-03 12:23:54 -07:00 |
|
Isaac Connor
|
5a08fcc1db
|
whitespace, handle file not found
|
2018-04-03 12:23:38 -07:00 |
|
Isaac Connor
|
dfc35721f9
|
ensure that sections are always > section_length
|
2018-04-03 07:03:12 -07:00 |
|
Isaac Connor
|
ceb12cdd81
|
undo a debug thing that shouldn't have been committed
|
2018-04-03 09:12:18 -04:00 |
|
Isaac Connor
|
a5b77a59d3
|
allow 0 pre_event_count
|
2018-03-29 12:35:03 -04:00 |
|
Isaac Connor
|
82c44da9be
|
remove some space
|
2018-03-29 12:24:21 -04:00 |
|
Isaac Connor
|
0053404553
|
remove some spaces
|
2018-03-29 12:24:12 -04:00 |
|
Isaac Connor
|
a56eafe796
|
when deleting Logger object, need to reset zmInitialized because we clear all the codes
|
2018-03-29 12:24:00 -04:00 |
|
Isaac Connor
|
b22911f554
|
wait to closeEvent on monitor shutdown
|
2018-03-28 14:03:56 -04:00 |
|
Isaac Connor
|
4be64152e8
|
put mutex around inserting event stats
|
2018-03-28 09:12:38 -04:00 |
|
Isaac Connor
|
b8a792cfb7
|
whitespace google code style
|
2018-03-27 11:04:40 -04:00 |
|
Isaac Connor
|
3a5ff289d0
|
perfect the whitespace
|
2018-03-27 10:04:32 -04:00 |
|
Isaac Connor
|
bcc7011871
|
update sql loading code in Reload, which will automatically do the db locking
|
2018-03-27 10:04:19 -04:00 |
|
Isaac Connor
|
161a0c81f3
|
pull
add mutex around log to db
|
2018-03-23 14:34:50 -04:00 |
|
Isaac Connor
|
2107e5b223
|
whitespace
|
2018-03-23 12:50:53 -04:00 |
|
Isaac Connor
|
11cf3ce482
|
whitespace
|
2018-03-22 11:33:24 -04:00 |