Isaac Connor
a1847aff75
add in new experimental nvsocket camera
2017-10-02 12:57:40 -04:00
Isaac Connor
ddb7305aab
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-02 09:11:55 -04:00
Isaac Connor
8c1cfb28a5
use c-style casts because they work
2017-09-26 16:13:26 -04:00
Isaac Connor
94fd113b63
use c-style casts because they work
2017-09-26 16:12:20 -04:00
Isaac Connor
1ba0a52769
remove const... which is preventing us from building on trusty
2017-09-26 12:53:54 -04:00
Isaac Connor
38a4ca1a6f
use storageareas when outputting zone diag images
2017-09-26 09:33:33 -04:00
Isaac Connor
e277456682
put parenthesis back in
2017-09-26 09:15:54 -04:00
Isaac Connor
9f93bfc23b
use Monitor Id in path to diag images instead of monitor name as the name is a convenience link and not guaranteed to exist
2017-09-25 18:45:58 -04:00
Isaac Connor
1791d3d5b7
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-09-25 16:23:33 -04:00
Isaac Connor
84be41998a
make debug lines more informative
2017-09-25 16:23:27 -04:00
Isaac Connor
74bb2da668
remove extra parenthesis
2017-09-25 16:23:15 -04:00
Isaac Connor
3227599e01
google code style
2017-09-25 16:22:52 -04:00
Isaac Connor
869d2b4f16
make failure to symlink non-fatal. Someday we may want to use a file store that doesn't do symlinks
2017-09-25 16:22:41 -04:00
Isaac Connor
8941bc80b8
reduce log level for success debug message
2017-09-25 16:21:46 -04:00
Isaac Connor
2a39cf2bcd
split videostore opening out of the constructor so that we can test for failure
2017-09-25 15:28:14 -04:00
Isaac Connor
fef503f90c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-09-23 13:42:44 -04:00
Isaac Connor
fa37a55226
if debug is not on, limit the log level to each destination. This makes checks to meffectivelevel work
2017-09-23 13:41:20 -04:00
Isaac Connor
7d2453e7ac
fix google code style
2017-09-04 15:28:23 -04:00
Isaac Connor
08bdf5a729
fix build on trusty
2017-08-24 12:19:57 -04:00
Isaac Connor
2a4f751a4f
ffmpeg versionc heck
2017-08-24 12:00:48 -04:00
Isaac Connor
2daae43760
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-08-24 10:14:00 -04:00
Isaac Connor
48e9e12063
assume source=monitor when a monitor_id is specified
2017-08-24 10:13:46 -04:00
Isaac Connor
789de37d33
fix builds on older ffmpeg
2017-08-24 09:53:40 -04:00
Isaac Connor
a4cf47b5c3
move swscale into it's own files
2017-08-23 15:06:12 -04:00
Isaac Connor
a81ff85fbb
add ffmpeg decoding of a .mp4 to get the frames
2017-08-23 15:05:44 -04:00
Isaac Connor
5c13ae26e3
Merge branch 'storageareas' into work_on_zms
2017-08-23 10:43:19 -04:00
Isaac Connor
732ebf6df4
shorted some variable names and correct spacing
2017-08-23 10:37:32 -04:00
Isaac Connor
eb5cee7f3e
use ifdef around uses of AV_CODEC_ID_H265 and fix google code style
2017-08-23 10:14:06 -04:00
Isaac Connor
e98ea0b891
fix non hwaccel build
2017-08-22 10:47:37 -04:00
Isaac Connor
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
Andrew Bauer
ac5d1738ea
allow changing of the timestamp char code delimeter ( #1972 )
2017-08-21 11:27:11 -04:00
Isaac Connor
cf8560b648
fix duration if it's negative
2017-08-21 10:15:56 -04:00
Isaac Connor
a63d0878b6
remove more hwaccel code
2017-08-16 13:41:44 -04:00
Isaac Connor
da5438a6ff
detect hardware accel capabilities
2017-08-16 12:16:15 -04:00
Isaac Connor
9e2aa941fc
rough in vaapi and qsv decoders. More debugging
2017-08-16 11:31:47 -04:00
Isaac Connor
ad0644b906
Merge branch 'storageareas' into vaapi
2017-08-15 16:05:25 -04:00
Isaac Connor
e24a2935d2
remove unneeded error message
2017-08-15 13:49:11 -04:00
Isaac Connor
591fdfe68c
fix
2017-08-15 13:44:23 -04:00
Isaac Connor
38111e80a5
use AVERROR_EOF instead of EOF
2017-08-15 13:17:51 -04:00
Isaac Connor
ae579c9649
potentially fix a crash when camera sends aac
2017-08-15 12:16:29 -04:00
Isaac Connor
adab628af9
fix video speed, various other
2017-08-14 18:22:52 -04:00
Isaac Connor
b255414bbb
Merge branch 'storageareas' into remove_ffmpeg_thread
2017-08-14 11:15:25 -04:00
Isaac Connor
0f0ab6170b
Don't decode video until we have received a keyframe.
2017-08-14 11:15:09 -04:00
Isaac Connor
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
Isaac Connor
087b7abb94
Merge branch 'master' into fix_event_viewing
2017-08-14 10:41:04 -04:00
ralimi
ecb7df0e8b
Support SSL for mysql connections ( #1965 )
...
* Fix install location for config files when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Omitted README file that should have appeared in /etc/zm/conf.d
* Fix location for configs when building to alternate directory.
* Fix works, but this should go on a branch instead.
* Fix works, but this should go on a branch instead.
* Fix location for configs when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Remove double quotes. This is a list of paths.
* Allow SSL database connection to be secured with SSL.
* Fix incorrect variable name
* Fix PHP syntax errors
* SSL connection parameters must also be passed in API.
* Revert fixes to build files; they should not be in this branch.
2017-08-14 10:30:42 -04:00
Isaac Connor
014951bf78
fix connect
2017-08-11 13:00:18 -04:00
Isaac Connor
83f8a240d5
blah
2017-08-11 12:20:46 -04:00
Isaac Connor
daee5b4450
experiment with no ffmpeg thread
2017-08-11 12:03:37 -04:00
Isaac Connor
536ccc0cec
maybe fix memleak, maybe fix crash
2017-08-10 15:44:20 -04:00
