Andrew Bauer
|
3dc424282b
|
Support quoting config variables (#2175)
* allow handling of quotes in config files
* copy paste error
* surround zm_arptool in quotes
|
2018-08-11 12:56:16 -04:00 |
Isaac Connor
|
3b86d9255b
|
adjust some spacing
|
2018-08-10 11:16:27 -04:00 |
|
Isaac Connor
|
744884203c
|
adjust some spacing
|
2018-08-10 11:16:20 -04:00 |
|
Isaac Connor
|
a335eb66de
|
remove some extra braces
|
2018-08-10 11:16:04 -04:00 |
|
Isaac Connor
|
f2525253bb
|
spacing, remove excess parenthesis etc
|
2018-08-10 11:15:51 -04:00 |
|
Isaac Connor
|
185586ecd4
|
we must try to create the SOCK_DIR because nowadays systemd is chrooting processes and PATH_SOCKS may not exist
|
2018-08-10 11:15:15 -04:00 |
|
Isaac Connor
|
97a6a28182
|
You should just mkdir and handle EEXIST because stating first is a race condition
|
2018-08-10 11:14:41 -04:00 |
|
Isaac Connor
|
3962c52288
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-08-09 11:23:37 -04:00 |
|
Isaac Connor
|
9f183f5df7
|
google code style, improve debugging, add bandwidth code
|
2018-08-09 11:23:13 -04:00 |
|
Isaac Connor
|
f089f7d4bd
|
Add a mkdir for the ZM_SOCKS_PATH
|
2018-08-06 10:34:08 -04:00 |
|
Isaac Connor
|
a44df858be
|
Merge branch 'master' into storageareas
|
2018-08-02 15:40:44 -04:00 |
|
Isaac Connor
|
a0e67da51d
|
Improve loging around writing out analysis frames
|
2018-08-02 15:40:33 -04:00 |
|
Isaac Connor
|
50c7eec0ff
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-08-02 05:25:53 -04:00 |
Isaac Connor
|
246070793b
|
Fix crash in zma dur to images array not being allocated when analysis_fps not being set
|
2018-07-31 13:36:03 -04:00 |
|
Isaac Connor
|
908f81c6ef
|
Add some more debug
|
2018-07-31 13:22:52 -04:00 |
|
Isaac Connor
|
639717eb7b
|
If mysql gets restarted, and there is no change in fps, then the monitor_status record never gets updated. So just always update it.
|
2018-07-31 12:07:57 -04:00 |
Isaac Connor
|
61e7136857
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-07-12 17:03:21 -04:00 |
|
Isaac Connor
|
d3034670a0
|
Merge branch 'master' into storageareas
|
2018-07-10 11:03:33 -04:00 |
|
Isaac Connor
|
974e42a610
|
spacing
|
2018-07-09 13:07:49 -04:00 |
|
Isaac Connor
|
dd479c9e55
|
remove () around return
|
2018-07-04 14:50:47 -04:00 |
|
Isaac Connor
|
ea86cb1181
|
Add debugging line to try to figure out starttime in the future problem
|
2018-06-15 10:16:28 -04:00 |
|
Isaac Connor
|
a594a1b6f1
|
Merge branch 'master' into storageareas
|
2018-06-15 09:45:11 -04:00 |
|
Isaac Connor
|
593209edd2
|
turn off passthrough for remote rtsp as it doesn't work at this time.
|
2018-06-14 13:28:05 -04:00 |
|
Isaac Connor
|
a745790541
|
Use 1 for successful return from CaptureAndRecord
|
2018-06-14 13:27:46 -04:00 |
|
Isaac Connor
|
8450d532b4
|
Add STDC_FORMAT_MACROS and include cinttypes so that PRIu64 works on centos7
|
2018-06-14 12:24:58 -04:00 |
|
Isaac Connor
|
09dae432ce
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-06-09 12:19:50 -04:00 |
|
Isaac Connor
|
934ce654f9
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-06-08 15:21:43 -04:00 |
|
Isaac Connor
|
794c6b641c
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-06-04 14:59:56 -04:00 |
|
Andrew Bauer
|
b071aaad7b
|
Merge pull request #2111 from connortechnology/recursive_mutex
Implement a RecursiveMutex class which is an explicit Recursive Mutex…
|
2018-06-02 17:30:21 -05:00 |
|
Isaac Connor
|
173121b645
|
Merge branch 'recursive_mutex' into storageareas
|
2018-06-01 11:30:08 -04:00 |
|
Isaac Connor
|
87d9fc447e
|
google code style
|
2018-06-01 11:27:53 -04:00 |
|
Isaac Connor
|
316dbb5eb8
|
Implement a RecursiveMutex class which is an explicit Recursive Mutex. Change the db mutex to a recursive Mutex
|
2018-06-01 11:27:35 -04:00 |
|
Isaac Connor
|
64d5f180c8
|
add Disconnect to Close
|
2018-05-26 13:03:13 -04:00 |
|
Isaac Connor
|
84db1be31d
|
add version test to get rid of deprecation warning for refcounted_frames
|
2018-05-26 13:01:51 -04:00 |
|
Isaac Connor
|
39db8136b3
|
move pre_event_images init to constructor, getting rid of static_undef tests. Initialize timestamps to 0. Clean up some logic in Analyze
|
2018-05-26 13:01:30 -04:00 |
|
Isaac Connor
|
8792190f75
|
use 0 for return code when exiting cleanly
|
2018-05-25 14:21:41 -04:00 |
|
Isaac Connor
|
dd8e4da9ba
|
google code style
|
2018-05-25 14:21:06 -04:00 |
|
Isaac Connor
|
52de6ef7ea
|
delete authenticator when destructing. reduce memleak
|
2018-05-25 14:20:54 -04:00 |
|
Isaac Connor
|
e831c1563d
|
pretty the code structure
|
2018-05-24 10:59:26 -04:00 |
|
Isaac Connor
|
b7129578c1
|
fix case where pre_event_count=0 and analysis_fps is set because there are no pre_event_buffers
|
2018-05-24 10:59:15 -04:00 |
|
Isaac Connor
|
dc5ccd04ef
|
Update thumbnail with high scoring image.
|
2018-05-22 11:31:03 -04:00 |
|
Isaac Connor
|
5df2fbfff2
|
fix logic to handle no pre_event frames
|
2018-05-15 15:53:25 -04:00 |
|
Isaac Connor
|
4ca77fdd69
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-05-15 12:44:36 -04:00 |
|
Isaac Connor
|
98b2a3f6f0
|
improve structure/spacing
|
2018-05-15 12:44:24 -04:00 |
|
Isaac Connor
|
038c5f4e1a
|
log the log line not the uninitialized sql
|
2018-05-14 13:57:26 -04:00 |
Isaac Connor
|
945825cdcb
|
Google code style, fix join() in that we weren't using the delimitere parameter
|
2018-05-12 14:37:41 -07:00 |
|
Isaac Connor
|
d9fff848e7
|
change Groups to a vector, add GroupNames function
|
2018-05-12 14:37:26 -07:00 |
|
Isaac Connor
|
1ef5226316
|
cleanup
|
2018-05-12 14:37:13 -07:00 |
|
Isaac Connor
|
0a5980ce2e
|
Fix prealarmcount > alarm_frames. If Alarm frames is 1 and PreEventCount == 0, then the old line would have evaluated to true. By making it > alarm_count instead of >= alarm_count-1, we get the same behaviour for non-zero preevent counts, and also since alarm_frames >= 1 always, we handle the preeventcount=0 case.
|
2018-05-11 12:18:24 -04:00 |
|
Isaac Connor
|
190ac69975
|
reintroduce FfmpegInterruptCallBack so that av_read_frame can be made to quit
|
2018-05-08 12:02:08 -04:00 |
|
Isaac Connor
|
055be6b613
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-05-07 10:14:04 -07:00 |
|
Isaac Connor
|
ced208457d
|
spacing, google code style
|
2018-05-07 10:13:36 -07:00 |
|
Isaac Connor
|
4f1cc02f58
|
Merge ../ZoneMinder.master into storageareas
|
2018-05-07 11:08:10 -04:00 |
|
Isaac Connor
|
d31b33ffc6
|
add a code comment
|
2018-05-07 11:08:06 -04:00 |
|
Isaac Connor
|
cdf53e36e9
|
Google code style
|
2018-05-07 11:07:58 -04:00 |
|
Isaac Connor
|
b6887c277d
|
google code style
|
2018-05-07 10:27:40 -04:00 |
|
Isaac Connor
|
8ed015966b
|
add zm_terminate to main while loop
|
2018-05-07 10:27:26 -04:00 |
|
Isaac Connor
|
4d4a7a4221
|
Initialize bytes to zero in camera constructor.
|
2018-05-07 10:27:06 -04:00 |
|
Isaac Connor
|
f2c099f1e4
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-05-04 16:01:25 -04:00 |
|
Andrew Bauer
|
7bc2c6dbc5
|
Downgrade Unable to send stream to warning
Downgraded this from en Error to a Warning. This message can trigger following the normal closing of a monitor. Thus, it's not necessarily an error.
|
2018-05-04 12:04:28 -05:00 |
|
Isaac Connor
|
375af59657
|
use unsigned for formatting
|
2018-05-04 09:58:22 -04:00 |
|
Isaac Connor
|
62f8f5cfdb
|
whitespace
|
2018-05-03 13:54:18 -04:00 |
|
Isaac Connor
|
6d5e46e91f
|
whitspace
|
2018-05-03 13:54:05 -04:00 |
|
Isaac Connor
|
67adad5d5c
|
use trylock instead of lock because our signal handler may try to log while the db is locked
|
2018-05-03 13:53:53 -04:00 |
|
Isaac Connor
|
c6fde10766
|
Implement trylock
|
2018-05-03 13:53:32 -04:00 |
|
Isaac Connor
|
29140a3012
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-05-02 14:13:11 -07:00 |
|
Isaac Connor
|
5988bed825
|
make encodeloop return frame_size to indicate error so that we can bail
|
2018-05-02 12:21:01 -07:00 |
|
Isaac Connor
|
eea58091c8
|
add groups
|
2018-05-02 12:20:36 -07:00 |
|
Isaac Connor
|
548cbd2b66
|
add groups
|
2018-05-02 12:20:07 -07:00 |
|
Isaac Connor
|
1cd7b73114
|
turn off closing event in a separate thread, add Groups
|
2018-05-02 12:20:01 -07:00 |
|
Isaac Connor
|
d8b461806a
|
fix StartTime in the future log
|
2018-05-02 11:37:54 -04:00 |
|
Isaac Connor
|
d46c06d201
|
remove extra event=NULL and spaces
|
2018-05-01 12:19:46 -04:00 |
|
Isaac Connor
|
fb9a12ddba
|
add locking around loading Zone
|
2018-05-01 12:19:34 -04:00 |
|
Isaac Connor
|
11ce50925c
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-05-01 09:42:11 -04:00 |
|
Isaac Connor
|
c8eab2d275
|
remove debug log to stdout that shouldn't be there. It messes up zms
|
2018-05-01 09:41:46 -04:00 |
|
Isaac Connor
|
cae2c9e237
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-30 15:11:32 -04:00 |
|
Isaac Connor
|
469a7347e8
|
include zm_terminate to make Capture break out of process is TERM'd
|
2018-04-30 15:09:00 -04:00 |
|
Isaac Connor
|
2845f891bc
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-30 10:12:41 -04:00 |
|
Isaac Connor
|
e55846e716
|
Log start_time when its > Now
|
2018-04-30 10:12:34 -04:00 |
|
Isaac Connor
|
a4da624f4c
|
break out of loops when zm-terminate is set
|
2018-04-27 13:20:38 -07:00 |
|
Isaac Connor
|
8a80cf686b
|
Merge branch 'master' into storageareas
|
2018-04-26 21:58:34 -04:00 |
|
Isaac Connor
|
356badf21d
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-04-26 11:57:46 -04:00 |
|
Isaac Connor
|
ee8f371deb
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-25 11:13:25 -04:00 |
|
Isaac Connor
|
8bdc68dc65
|
include zm_signal.h so that we have access to zm_terminate. Use zm_terminate to break out of endless loops. Add incoming bytes counts
|
2018-04-25 10:49:35 -04:00 |
|
Isaac Connor
|
117555a857
|
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
|
2018-04-25 09:39:10 -04:00 |
|
Isaac Connor
|
61fe2a734b
|
Add SIGHUP handler so that zmc reloads instead of dies
|
2018-04-25 09:38:18 -04:00 |
|
Isaac Connor
|
371f5dbc00
|
a zero duration will lead to a non-monotonic non-incrementing pts, so we have to use 1 instead.
|
2018-04-25 09:37:04 -04:00 |
|
Isaac Connor
|
f04bccceb2
|
handle out of order pts better
|
2018-04-25 04:59:08 -04:00 |
|
Isaac Connor
|
184596ed4b
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-25 04:29:35 -04:00 |
|
Isaac Connor
|
20f6985dff
|
implement capturing bandwidth
|
2018-04-24 14:11:27 -04:00 |
Andy Bauer
|
678503b992
|
fix ftbs on el7
|
2018-04-24 12:16:19 -05:00 |
|
Isaac Connor
|
bbb10fa4b4
|
Turn off ffmpeg debugging output, as it seems to conflict with the code at zm_db.cpp 34
|
2018-04-24 12:40:15 -04:00 |
|
Isaac Connor
|
21413c0fe6
|
comment out corrupting code
|
2018-04-24 11:49:10 -04:00 |
|
Isaac Connor
|
cc525b2397
|
Output more detailed shared mem size info
|
2018-04-24 11:41:54 -04:00 |
|
Isaac Connor
|
4d95498664
|
Prevent double init of Ffmpeg by using FFMPEGInit()
|
2018-04-24 11:41:31 -04:00 |
|
Isaac Connor
|
cc77561826
|
fix last_event being uint64
|
2018-04-24 11:40:38 -04:00 |
|
Isaac Connor
|
b5ff820c61
|
Test that shm is always valid in zma so that zma dies if zmc does.
|
2018-04-23 16:24:44 -04:00 |
|
Isaac Connor
|
5f7d404a0c
|
spacing & style. Put locking around db accesses in RealoadLinkedMonitors
|
2018-04-23 16:24:15 -04:00 |
|
Isaac Connor
|
e8eaf5fc80
|
quiten build error
|
2018-04-23 14:43:16 -04:00 |
|
Isaac Connor
|
c0d04521d4
|
cleanup. Google Code Style. Move diag_path from a static to a class member so that multiple zones will create different diag files.
|
2018-04-23 14:36:54 -04:00 |
|
Isaac Connor
|
18b015903a
|
cleanup. Google Code Style. Move diag_path from a static to a class member so that multiple zones will create different diag files.
|
2018-04-23 14:36:46 -04:00 |
|
Isaac Connor
|
3ab0755e03
|
google code style plus other cleanups
|
2018-04-23 13:50:10 -04:00 |
|
Isaac Connor
|
a110ae71f5
|
put lines back preventing double open of mysql
|
2018-04-23 13:48:14 -04:00 |
|
Isaac Connor
|
235fc640be
|
exit_zmu must come before use
|
2018-04-23 11:15:33 -04:00 |
|
Isaac Connor
|
11cacebb3b
|
use a function called exit_zmu instead of exit() to properly close logs and db. The reason is just to reduce connection lost logs in mysql.
|
2018-04-23 11:14:44 -04:00 |
|
Isaac Connor
|
3b9f7b38c5
|
Use int instead of long. Monitor->GetCaptureDelay returns an int, so no reason to use long.
|
2018-04-23 10:40:42 -04:00 |
|
Isaac Connor
|
609244857d
|
google styleguide updates
|
2018-04-23 10:39:32 -04:00 |
|
Isaac Connor
|
9c0600cace
|
Add a HUP Handler
|
2018-04-23 10:29:42 -04:00 |
|
Andrew Bauer
|
35dcedb2ad
|
fix ftbs on el7
adds compiler support for PRIu64
|
2018-04-21 20:55:21 -05:00 |
|
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 |