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
Andrew Bauer
c5c68d064e
Merge pull request #1930 from connortechnology/split_zmeventstream
...
split EventStream into it's own files
2017-08-09 20:36:17 -05:00
Isaac Connor
cc28af8ed2
rework things to always start the recording on a video keyframe. Also fix pts/dts of remaining audio frames
2017-08-09 12:50:46 -04:00
Isaac Connor
b203e10c65
remove some newlines that shouldn't be there. Fix some logic when flushing audio encoder
2017-08-04 14:14:25 -04:00
Isaac Connor
00533fc624
potentially fix memleaks
2017-08-03 12:41:26 -04:00
Isaac Connor
5a73c38237
video storage fixes ( #1958 )
...
* use a monitor object instead of just a db array.
* fix braces, spacing, move pod docs to bottom
* Fix memleak by freeing input and output frames
* Always set the packet stream_index to the id of the output stream.
2017-08-02 16:29:23 -04:00
Isaac Connor
3467b29a0c
fix setting of packet stream index
2017-08-02 16:15:38 -04:00
Isaac Connor
4f032c8e65
rough in vaapi
2017-08-02 16:15:11 -04:00
Isaac Connor
259b7f7655
fix memleak
2017-07-31 15:49:27 -04:00
Isaac Connor
49319990fa
Don't keep setting the event_file unnecessarily. Add some code comments
2017-07-26 10:38:18 -04:00
Isaac Connor
e92974c5d4
fix spacing
2017-07-13 09:41:46 -04:00
Isaac Connor
d3ec50aa69
various fixes plus use global db functions in logger
2017-07-06 17:45:23 -04:00
Isaac Connor
323aedde4e
fix merge
2017-07-06 12:41:15 -04:00
Isaac Connor
2a71b0f170
Merge branch 'storageareas' into work_on_zms
2017-07-06 12:39:44 -04:00
Isaac Connor
c3c6459052
Merge branch 'montagereview_rework' into storageareas
2017-07-05 15:34:02 -04:00
Isaac Connor
95ba837bda
fix braces
2017-07-05 14:25:23 -04:00
Isaac Connor
0e40897e02
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-05 14:24:09 -04:00
Isaac Connor
8569c7523a
fix braces
2017-07-05 14:11:58 -04:00
