7d2453e7ac
fix google code style
2017-09-04 15:28:23 -04:00
9fef9d19dd
add zm_ffmpeg_input
2017-09-04 15:01:00 -04:00
c70706e253
Merge branch 'storageareas' into zma_to_thread
2017-09-04 14:38:00 -04:00
08bdf5a729
fix build on trusty
2017-08-24 12:19:57 -04:00
2a4f751a4f
ffmpeg versionc heck
2017-08-24 12:00:48 -04:00
2daae43760
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-08-24 10:14:00 -04:00
48e9e12063
assume source=monitor when a monitor_id is specified
2017-08-24 10:13:46 -04:00
789de37d33
fix builds on older ffmpeg
2017-08-24 09:53:40 -04:00
a4cf47b5c3
move swscale into it's own files
2017-08-23 15:06:12 -04:00
a81ff85fbb
add ffmpeg decoding of a .mp4 to get the frames
2017-08-23 15:05:44 -04:00
5c13ae26e3
Merge branch 'storageareas' into work_on_zms
2017-08-23 10:43:19 -04:00
732ebf6df4
shorted some variable names and correct spacing
2017-08-23 10:37:32 -04:00
eb5cee7f3e
use ifdef around uses of AV_CODEC_ID_H265 and fix google code style
2017-08-23 10:14:06 -04:00
e98ea0b891
fix non hwaccel build
2017-08-22 10:47:37 -04:00
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
ac5d1738ea
allow changing of the timestamp char code delimeter ( #1972 )
2017-08-21 11:27:11 -04:00
cf8560b648
fix duration if it's negative
2017-08-21 10:15:56 -04:00
a63d0878b6
remove more hwaccel code
2017-08-16 13:41:44 -04:00
da5438a6ff
detect hardware accel capabilities
2017-08-16 12:16:15 -04:00
9e2aa941fc
rough in vaapi and qsv decoders. More debugging
2017-08-16 11:31:47 -04:00
ad0644b906
Merge branch 'storageareas' into vaapi
2017-08-15 16:05:25 -04:00
e24a2935d2
remove unneeded error message
2017-08-15 13:49:11 -04:00
591fdfe68c
fix
2017-08-15 13:44:23 -04:00
38111e80a5
use AVERROR_EOF instead of EOF
2017-08-15 13:17:51 -04:00
ae579c9649
potentially fix a crash when camera sends aac
2017-08-15 12:16:29 -04:00
adab628af9
fix video speed, various other
2017-08-14 18:22:52 -04:00
b255414bbb
Merge branch 'storageareas' into remove_ffmpeg_thread
2017-08-14 11:15:25 -04:00
0f0ab6170b
Don't decode video until we have received a keyframe.
2017-08-14 11:15:09 -04:00
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
087b7abb94
Merge branch 'master' into fix_event_viewing
2017-08-14 10:41:04 -04:00
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
014951bf78
fix connect
2017-08-11 13:00:18 -04:00
83f8a240d5
blah
2017-08-11 12:20:46 -04:00
daee5b4450
experiment with no ffmpeg thread
2017-08-11 12:03:37 -04:00
536ccc0cec
maybe fix memleak, maybe fix crash
2017-08-10 15:44:20 -04:00
c5c68d064e
Merge pull request #1930 from connortechnology/split_zmeventstream
...
split EventStream into it's own files
2017-08-09 20:36:17 -05:00
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
b203e10c65
remove some newlines that shouldn't be there. Fix some logic when flushing audio encoder
2017-08-04 14:14:25 -04:00
00533fc624
potentially fix memleaks
2017-08-03 12:41:26 -04:00
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
3467b29a0c
fix setting of packet stream index
2017-08-02 16:15:38 -04:00
4f032c8e65
rough in vaapi
2017-08-02 16:15:11 -04:00
259b7f7655
fix memleak
2017-07-31 15:49:27 -04:00
49319990fa
Don't keep setting the event_file unnecessarily. Add some code comments
2017-07-26 10:38:18 -04:00
e92974c5d4
fix spacing
2017-07-13 09:41:46 -04:00
da74f8d533
initial turn zma into a thread
2017-07-10 19:37:55 -04:00
d3ec50aa69
various fixes plus use global db functions in logger
2017-07-06 17:45:23 -04:00
323aedde4e
fix merge
2017-07-06 12:41:15 -04:00
2a71b0f170
Merge branch 'storageareas' into work_on_zms
2017-07-06 12:39:44 -04:00
c3c6459052
Merge branch 'montagereview_rework' into storageareas
2017-07-05 15:34:02 -04:00
95ba837bda
fix braces
2017-07-05 14:25:23 -04:00
0e40897e02
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-05 14:24:09 -04:00
8569c7523a
fix braces
2017-07-05 14:11:58 -04:00
2bc679e65e
if a 0 scale is given, default to 100%
2017-07-05 14:11:17 -04:00
834d1dddfa
fix braces
2017-07-05 14:10:09 -04:00
1849b1e69b
fix code spacing, add codecpar dumping when failed to write frame
2017-07-05 13:09:00 -04:00
fdd0e8dc1b
fix spacing
2017-07-05 13:08:31 -04:00
efba7be9c7
switch back to int i... google style guide says to use signed counters in for loops. Ok. Get's rid of compiler warning because i_nales is signed.
2017-07-05 13:08:16 -04:00
121aba0308
add parenthesis around truth value to quieten compiler
2017-06-29 15:41:21 -04:00
90696331a9
Merge branch 'master' into storageareas
2017-06-26 21:58:11 -04:00
62d6394923
finish roughing in ffmpeg_input
2017-06-26 16:55:49 -04:00
24dd3a8c66
fix loading starttime of event
2017-06-26 11:20:10 -04:00
0d8e4656dc
fix braces
2017-06-26 09:46:07 -04:00
52f1e2d235
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-23 10:11:52 -04:00
b73c0ba978
rough in zm_ffmpeg_input and split out eventstream
2017-06-22 17:58:32 -04:00
fcc852c859
fix cpplint.py complaints
2017-06-22 16:06:31 -04:00
4df354dc24
fix order of send_frame and break and fix if ( usleep ) which should be if ( delta_us )
2017-06-22 10:48:15 -04:00
c241b6dddd
Merge branch 'split_zmeventstream' into storageareas
2017-06-22 10:46:32 -04:00
950c8f19d3
Upstream FreeBSD patches ( #1926 )
...
* apply FreeBSD patches
* timeval struct needs time.h
* typo
* added forgotten destination for systemd startup script install
2017-06-22 10:14:24 -04:00
394001604d
add the new files for EventStream
2017-06-22 10:12:04 -04:00
226514e887
split EventStream into it's own files
2017-06-22 10:10:28 -04:00
a29ad958c9
Merge branch 'master' into storageareas
2017-06-22 10:00:28 -04:00
1bba664e3d
whitspace
2017-06-22 09:55:45 -04:00
76f63686cb
Merge branch 'fix_event_viewing' into storageareas
2017-06-22 09:24:31 -04:00
5e75588bfb
Fix event viewing. Output a frame immediately on zoom in/out. Fix recursive loop on play/pause
2017-06-21 17:14:02 -04:00
91a070b835
Merge branch 'master' into storageareas
2017-06-15 13:13:08 -04:00
8527e5f1de
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-15 13:03:09 -04:00
119f8fc86c
Fix version checks to fix build on yaketty
2017-06-15 13:02:54 -04:00
b886a2daa2
Merge branch 'master' into storageareas
2017-06-14 11:25:02 -04:00
3dc9594461
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-14 11:24:54 -04:00
07a2d49a41
Merge branch 'log_no_truncate'
2017-06-14 11:23:39 -04:00
a4b3f6b41a
fix form of delete used
2017-06-14 10:54:21 -04:00
b51d885f66
fix build on old ffmpeg
2017-06-14 10:36:08 -04:00
9f301e3c51
Merge branch 'log_no_truncate' into storageareas
2017-06-14 10:18:27 -04:00
1361b8952f
change mode of opening log files to append instead of overwrite
2017-06-14 10:15:08 -04:00
f0d80ddfd4
fix runstate merge
2017-06-13 21:18:09 -04:00
7a67a5e475
fix merge
2017-06-13 21:15:58 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
dd70eb3e5f
more deprecation fixes
2017-06-13 17:06:50 -04:00
42100d9a33
introduce current_event in videostore_data so we know which event we are writing a video file for. Also, GetLastEventId so that non-friends can find out the event id of the current event.
2017-06-13 17:05:37 -04:00
3c053b36ef
introduce zm_dump_codecpar and zm_dump_codec to be used for debugging
2017-06-13 16:51:51 -04:00
417421b1d8
move include <sys/uio.h> outside defined(BSD) block ( #1919 )
2017-06-13 15:39:12 -04:00
bf04a68085
Merge pull request #1752 from connortechnology/filter_by_runstate
...
rough in the ability to filter on RunState
2017-06-12 20:54:17 -05:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
809d20dcd0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-06-09 14:25:11 -04:00
05d0e0ed71
Merge branch 'master' into storageareas
2017-06-09 14:20:49 -04:00
781d49dfb1
fix merge
2017-06-09 14:19:31 -04:00
3bfac9faff
Merge branch 'master' into storageareas
2017-06-09 13:00:24 -04:00
162cc05a33
when debug is turned on, fflush after every line. Debug logging is almost useless when debugging a crash without this.
2017-06-09 11:05:44 -04:00
f8cb0a5e21
Merge branch 'master' into add_was_alarmed
2017-06-09 10:46:01 -04:00
9669fede18
fix merge by putting back my dbRow object
2017-06-09 10:18:15 -04:00
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
d7b291f933
add more debug
2017-06-08 13:44:22 -04:00
02b2d8a968
put in ffmpeg version test
2017-06-08 12:22:28 -04:00
01717a5c14
Merge branch 'master' into filter_by_runstate
2017-06-06 20:34:47 -04:00
070f0d5d62
don't init converted_input_samples
2017-06-06 15:57:42 -04:00
1ab5e0e374
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-06 15:36:10 -04:00
7d97267dd2
fix compile on old ffmpeg
2017-06-06 15:35:17 -04:00
2bc6f1627e
Add support for conf.d subfolder ( #1902 )
...
* cmake changes to support conf.d
* php changes to support conf.d
* perl changes to support conf.d
* C changes to support conf.d
* add conf.d support to rpmspecfile
* fix typo
* specify ZM_CONFIG_SUBDIR in relevant target distros
* put back my config_file perl definition
* remove quotes from ZM macros
* fix snprintf
* add README to conf.d folder
* adjust rpm specfile
* remove custom permissions from README in rpmspecfile
* modify rpm README documentation to reflect conf.d support
* set ZM_CONFIG_SUBDIR in debian rules file
2017-06-05 16:39:19 -04:00
b9f65c9f50
remove merge marker
2017-06-05 09:26:05 -04:00
9534c725d6
Merge branch 'master' into storageareas
2017-06-05 09:21:37 -04:00
457a3273b1
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-05 09:05:28 -04:00
187bec40ec
Fix #1906
2017-06-05 09:05:17 -04:00
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
7ae0b4a546
handle older versions of ffmpeg
2017-06-03 10:13:39 -04:00
eeefb2c8e2
need previous_pts and dts for both video and audio. I don't think they can share
2017-06-02 16:53:14 -04:00
0ac26277e3
debug, fix deprecations, fix audio
2017-06-02 16:52:52 -04:00
915450de13
spacing and comments
2017-06-01 17:48:52 -04:00
98b3621681
add Debug, and fix logic deleting frames before the appropriate keyframe
2017-05-31 20:44:43 -04:00
a6421a9126
handle deprecations
2017-05-31 20:44:23 -04:00
2eabf13eaf
handle deprecations, make some logic more clear
2017-05-31 20:44:13 -04:00
bc32837e3a
fix braces
2017-05-31 13:55:21 -04:00
0e643f0f93
Merge branch 'master' into storageareas
2017-05-30 11:58:38 -04:00
772df5b41b
add a cast to quiet compiler warning
2017-05-30 10:31:02 -04:00
2e673e49c8
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-05-26 22:20:50 -04:00
90517ed0aa
Merge branch 'master' into add_was_alarmed
2017-05-25 14:01:27 -04:00
a515041e14
Merge branch 'master' into storageareas
2017-05-23 15:17:46 -04:00
5c673d5659
google style
2017-05-23 15:07:50 -04:00
54c9c37b21
Merge ../ZoneMinder.connortechnology
2017-05-20 09:55:06 -04:00
03495e8c23
fix
2017-05-20 09:54:03 -04:00
bb50784ed2
braces
2017-05-20 09:53:35 -04:00
0da03ca5e8
braces/whitespace
2017-05-20 09:41:13 -04:00
b123bd1da3
remove uneccessary zm_packetqueue.h
2017-05-20 09:12:05 -04:00
40993ce401
braces
2017-05-20 09:11:35 -04:00
23633ce30b
braces
2017-05-20 09:06:12 -04:00
a5ee8307d0
Merge ../ZoneMinder.connortechnology
2017-05-20 09:03:57 -04:00
457d7e5c94
code documentation, whitespace
2017-05-20 09:03:51 -04:00
dba947346a
braces
2017-05-20 09:03:04 -04:00
381d44439a
merge SA. braces/whitespace debugging
2017-05-20 09:01:32 -04:00
c24c427409
braces
2017-05-20 08:57:53 -04:00
ab365dc749
braces
2017-05-20 08:53:27 -04:00
62bd134277
whitespace/braces, also ffmpeg deprecation handling
2017-05-20 08:52:24 -04:00
3e426b87d3
init duration to 0 to quieten compiler
2017-05-20 08:35:06 -04:00
1ab8530aed
use enum values to make code more readable. Better error message on event insertion failure
2017-05-20 08:34:46 -04:00
7ecbcd8f12
code documentation
2017-05-20 08:26:55 -04:00
53abc14143
handle ffmpeg deprecations
2017-05-20 08:22:08 -04:00
13273cb50f
rmeove unneeded include
2017-05-19 15:13:42 -04:00
7caeee6bf8
Merge branch 'master' into storageareas
2017-05-19 15:09:44 -04:00
afb450573d
fix
2017-05-19 15:08:04 -04:00
e7ca892efd
merge more differences from SA
2017-05-19 15:07:41 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Andrew Bauer
Isaac Connor
ralimi
abishai