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 |
Andrew Bauer
|
ba10c431f7
|
check for __ARM_PCS_VFP instead of __armel__
|
2018-10-12 09:34:16 -05:00 |
|
Andrew Bauer
|
c7f9ffa521
|
Merge pull request #2217 from connortechnology/touch_lockfile
Touch lockfile
|
2018-10-11 08:45:09 -05:00 |
|
Isaac Connor
|
2881d2af3f
|
Merge branch 'master' into storageareas
|
2018-10-10 14:13:27 -04:00 |
|
Andrew Bauer
|
ad70648cb3
|
don't build neon instructions on armel (#2246)
|
2018-10-10 14:10:02 -04:00 |
|
Isaac Connor
|
e8316a0aea
|
Add detection of packets with massively negative pts. Just skip them
|
2018-09-28 14:19:36 -04:00 |
|
Isaac Connor
|
33bd30fbbd
|
Merge branch 'master' into storageareas
|
2018-09-28 13:40:18 -04:00 |
|
Isaac Connor
|
fe444218cc
|
Implement replay mode = none in zms. This mode was only handled for video html tag viewing.
|
2018-09-28 12:31:53 -04:00 |
|
Isaac Connor
|
7768b4eeef
|
Don't need to delete videoStore in destructor, as it gets done in CLose()
|
2018-09-28 11:37:16 -04:00 |
Isaac Connor
|
c481fc868f
|
be more robust when curFrames is empty.
|
2018-09-28 11:25:19 -04:00 |
|
Isaac Connor
|
e0dc8a5f6b
|
Merge branch 'master' into storageareas
|
2018-09-27 13:54:53 -04:00 |
|
Isaac Connor
|
49a7614504
|
revert change that breaks building on newer ffmpeg libs.
|
2018-09-26 18:35:29 -04:00 |
|
Isaac Connor
|
5ef64bf256
|
fix memleak on old libav distros
|
2018-09-26 16:20:29 -04:00 |
|
Isaac Connor
|
51f0e7e5c8
|
Add a default timebase if the codec timebase is invalid. Also fix crash when we can't open the .mp4
|
2018-09-26 15:34:01 -04:00 |
|
Isaac Connor
|
1419f20dcc
|
add setting rtsp_transport to udp. It is the default but we print out an error otherwise
|
2018-09-26 15:33:29 -04:00 |
|
Isaac Connor
|
2385c80a4a
|
cleanup code a bit
|
2018-09-26 15:32:54 -04:00 |
|
Isaac Connor
|
8f6db1c279
|
Merge branch 'master' into storageareas
|
2018-09-25 13:54:44 -04:00 |
|
Isaac Connor
|
b55224be30
|
fix setting mFlush. Just have it on for DEBUG levels
|
2018-09-24 14:17:16 -04:00 |
|
Isaac Connor
|
fd2e8a530c
|
When changing log levels by SIGUSR1 turn on flushing
|
2018-09-24 09:40:05 -04:00 |
|
Isaac Connor
|
45056c3602
|
fix deprecation warning
|
2018-09-23 16:51:54 -04: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
|
94796aea2c
|
Always make SWAP_PATH dir as under systemd it may be chrooted
|
2018-09-23 16:49:57 -04:00 |
|
Isaac Connor
|
ee168bf427
|
Properly initialize preevent frames data structures. Always update analysis fps. Make some warnings on loss of signal be Info's.
|
2018-09-23 16:49:06 -04:00 |
|
Isaac Connor
|
89cd7ceaf8
|
Whitespace, extra parentheses, google code style
|
2018-09-23 16:47: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
|
f61a1b7ebd
|
implement a touch() utility function
|
2018-09-21 15:57:48 -04:00 |
|
Isaac Connor
|
7abe4c40d5
|
Merge branch 'fix_2213' into storageareas
|
2018-09-19 20:02:27 -04:00 |
|
Isaac Connor
|
c8b10b2e3b
|
factor out some common code when creating the event directory and add a mkdir for creating the monitor directory. Should make event writing more robust when monitor dirs do not exist for some reason.
|
2018-09-19 19:50:26 -04:00 |
|
Isaac Connor
|
60b952ab86
|
Merge branch 'master' into storageareas
|
2018-09-13 16:20:36 -04:00 |
|
Isaac Connor
|
cc417cf3e7
|
reverse order of tests to be more efficient
|
2018-09-11 13:19:33 -04:00 |
|
Isaac Connor
|
c70fb2f195
|
When signal loss occurs, trigger an event close so that the event stops because we are no longer writing to the mp4
|
2018-09-10 17:11:16 -04:00 |
|
Isaac Connor
|
bf1fbd169c
|
return uninformative debug statement
|
2018-09-10 15:12:19 -04:00 |
|
Isaac Connor
|
5eec7e00c5
|
Merge branch 'master' into storageareas
|
2018-09-09 14:09:52 -04:00 |
|
Isaac Connor
|
a296b2b777
|
fix crash when savind audio on ffmpeg 2.8
|
2018-09-09 14:01:03 -04:00 |
|
Isaac Connor
|
e4c87ce256
|
Merge branch 'master' into storageareas
|
2018-09-09 11:36:52 -04:00 |
|
Isaac Connor
|
d945e2ba54
|
Fix context allocation on ffmpeg 2.8. Fixes #41 on connorTechnology fork.
|
2018-09-09 11:34:12 -04:00 |
|
Isaac Connor
|
fe1e17d097
|
Capture can reasonably return -1 for EOF.
|
2018-09-05 11:16:17 -04:00 |
|
Isaac Connor
|
14b5fc3660
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-08-31 18:43:29 -04:00 |
|
Isaac Connor
|
df3da6dd93
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-08-30 14:53:39 -04:00 |
|
Isaac Connor
|
0eaa539dc6
|
ZM_SWAP_PATH may not exist, so always try to create it
|
2018-08-30 14:53:27 -04:00 |
|
Isaac Connor
|
f2d4739838
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-08-24 17:11:39 -04:00 |
|
Isaac Connor
|
4be2a0501c
|
Merge branch 'master' into storageareas
|
2018-08-22 17:22:54 -04:00 |
|
Isaac Connor
|
d296d59625
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-08-22 16:34:29 -04:00 |
vajonam
|
d97eea886a
|
fix scoring algorithim, to use max_alarm_size when specified instead of the size of the zone. (#2186)
|
2018-08-22 12:58:26 -04:00 |
|
Isaac Connor
|
90eda0b88b
|
spacing, remove extra parenthesis
|
2018-08-22 11:14:00 -04:00 |
|
Isaac Connor
|
871e3807e6
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-08-17 12:57:27 -04:00 |
|
Isaac Connor
|
3ab542199c
|
Merge branch 'master' into storageareas
|
2018-08-13 11:17:04 -04:00 |
|
Isaac Connor
|
17a02d66f7
|
google code style
|
2018-08-11 13:35:37 -04:00 |
|
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 |