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
|
87140ecdb5
|
white space and quiet warning
|
2018-11-17 10:39:42 -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
|
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
|
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 |
Pliable Pixels
|
e06f5b0f90
|
removed static
|
2018-11-12 13:34:29 -05:00 |
|
Pliable Pixels
|
01a57222d3
|
keep track if we have written alarmed frame incase savejpeg is off
|
2018-11-12 12:43:20 -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
|
bca2b30518
|
Add a test for channel layout and correct it if not set
|
2018-10-24 13:45:33 -04:00 |
|
Isaac Connor
|
0f14df64e2
|
google code style and whitespace
|
2018-10-22 10:41:27 -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 |
|
Andrew Bauer
|
ad70648cb3
|
don't build neon instructions on armel (#2246)
|
2018-10-10 14:10:02 -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
|
c481fc868f
|
be more robust when curFrames is empty.
|
2018-09-28 11:25:19 -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
|
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
|
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
|
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
|
0bb672b86b
|
dick around reverting ffmpeg 3.4 deprecations to try to get fps correct
|
2018-09-10 17:10:39 -04:00 |
|
Isaac Connor
|
bf1fbd169c
|
return uninformative debug statement
|
2018-09-10 15:12:19 -04:00 |
|
Isaac Connor
|
a296b2b777
|
fix crash when savind audio on ffmpeg 2.8
|
2018-09-09 14:01:03 -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
|
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 |
|
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
|
a0e67da51d
|
Improve loging around writing out analysis frames
|
2018-08-02 15:40:33 -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
|
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
|
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 |