Isaac Connor
|
a38fcf5297
|
Add debug and use alternate way of figuring out how long to sleep to maintain fps
|
2019-02-26 11:41:02 -05:00 |
|
Isaac Connor
|
f7dd1b049d
|
Merge branch 'master' into storageareas
|
2019-02-26 10:16:11 -05:00 |
|
Isaac Connor
|
705468dfc4
|
if we don't have a connkey, comms will not be open so don't touch the sock file or call checkCommandQueue
|
2019-02-26 10:08:07 -05:00 |
|
Isaac Connor
|
7260f823cb
|
Merge branch 'master' into storageareas
|
2019-01-21 13:52:38 -05:00 |
|
Isaac Connor
|
83a652aade
|
add comments and a test for zm_terminate in the checkCommandQueue while loop
|
2019-01-21 13:29:14 -05:00 |
|
Isaac Connor
|
87d1390fed
|
Merge branch 'storageareas' into h265
|
2019-01-16 15:20:17 -05:00 |
|
Isaac Connor
|
f49dd93b6a
|
Merge branch 'master' into storageareas
|
2019-01-16 14:39:56 -05:00 |
|
Isaac Connor
|
3560d6247f
|
whitespace and comments.
|
2019-01-16 11:20:10 -05:00 |
|
Isaac Connor
|
6608cb4e35
|
use frame delta to determine how much to sleep
|
2019-01-15 11:25:22 -05:00 |
|
Isaac Connor
|
bc5f8d0d8d
|
rework pts/dts of audio stream. Spacing. Fix crash
|
2018-12-04 18:23:08 -05:00 |
|
Isaac Connor
|
b291c06035
|
Working zms h265 playing.
|
2018-11-19 16:45:56 -05:00 |
|
Isaac Connor
|
d973d55d2f
|
Use SaveJPEGs from the Event record instead of the Monitor Object
|
2018-11-06 11:45:34 -05:00 |
|
Isaac Connor
|
a8329465fb
|
Merge branch 'master' into h265
|
2018-10-22 10:30:01 -04:00 |
Andrew Bauer
|
c7f9ffa521
|
Merge pull request #2217 from connortechnology/touch_lockfile
Touch lockfile
|
2018-10-11 08:45:09 -05: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
|
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
|
ec6317bd66
|
change how frame data is stored to be more useful, pass frame time offset to getFrame to tell ffmpeg which frame to get
|
2018-09-11 13:20:41 -04:00 |
Andy Bauer
|
678503b992
|
fix ftbs on el7
|
2018-04-24 12:16:19 -05:00 |
|
Isaac Connor
|
fd1c69d48a
|
switch to uint64_t for event_id because long long can actually be 128 bit
|
2018-04-17 13:51:20 -04:00 |
Isaac Connor
|
f9f78e9aa3
|
Convert event_id to a 64bit unsigned int
|
2018-04-12 13:40:11 -07:00 |
|
Isaac Connor
|
b974b4dcd1
|
google code style, and when paused, don't die after 10 seconds
|
2018-04-12 13:14:00 -04:00 |
|
Isaac Connor
|
5a08fcc1db
|
whitespace, handle file not found
|
2018-04-03 12:23:38 -07:00 |
|
Isaac Connor
|
a6827c97ab
|
Cleanup, add some sanity checks
|
2018-03-02 18:24:39 -08:00 |
|
Isaac Connor
|
2922a86d23
|
fixes to new Storage Schemes code
|
2017-12-19 11:01:03 -05:00 |
|
Isaac Connor
|
97e3ac046e
|
close file handle on error
|
2017-12-12 13:38:31 -05:00 |
|
Isaac Connor
|
6bffc54b77
|
fix referencing event_data before we test it for null
|
2017-12-12 13:30:43 -05:00 |
|
Isaac Connor
|
159c0a7165
|
moer cppcheck fixes
|
2017-11-17 07:52:26 -05:00 |
|
Isaac Connor
|
57a53f6fdd
|
spacing and fixes
|
2017-11-09 15:03:23 -05:00 |
|
Isaac Connor
|
b54d340bda
|
google code style fix
|
2017-10-24 16:10:16 -07:00 |
|
Isaac Connor
|
666233af54
|
fix mving capture_file_format to staticCOnfig
|
2017-10-18 20:46:26 -04:00 |
|
Isaac Connor
|
98590b99f8
|
Merge branch 'storageareas' into work_on_zms
|
2017-09-04 14:35:02 -04:00 |
|
Isaac Connor
|
d11313e6bc
|
fix build
|
2017-09-01 18:03:34 -04:00 |
|
Isaac Connor
|
ed6ff23c2f
|
Merge branch 'storageareas' into work_on_zms
|
2017-09-01 17:53:59 -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
|
676c4b7ddc
|
Merge branch 'master' into storageareas
|
2017-08-22 09:52:14 -04:00 |
|
Isaac Connor
|
087b7abb94
|
Merge branch 'master' into fix_event_viewing
|
2017-08-14 10:41:04 -04:00 |
|
Isaac Connor
|
9fa48954db
|
more work
|
2017-07-18 22:30:22 -04:00 |
|
Isaac Connor
|
24a8915699
|
Merge debug statements into 1
|
2017-07-11 08:30:44 -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
|
62d6394923
|
finish roughing in ffmpeg_input
|
2017-06-26 16:55:49 -04:00 |
Isaac Connor
|
24dd3a8c66
|
fix loading starttime of event
|
2017-06-26 11:20:10 -04:00 |
|
Isaac Connor
|
b73c0ba978
|
rough in zm_ffmpeg_input and split out eventstream
|
2017-06-22 17:58:32 -04:00 |
|
Isaac Connor
|
c241b6dddd
|
Merge branch 'split_zmeventstream' into storageareas
|
2017-06-22 10:46:32 -04:00 |
|
Isaac Connor
|
394001604d
|
add the new files for EventStream
|
2017-06-22 10:12:04 -04:00 |