Commit Graph

18 Commits

Author SHA1 Message Date
Isaac Connor 6c8eac1ac8 Merge branch 'storageareas' into h265 2019-03-06 11:10:01 -05:00
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 87d1390fed Merge branch 'storageareas' into h265 2019-01-16 15:20:17 -05:00
Isaac Connor 345e2fef0f start only used in eventstream 2019-01-15 16:44:58 -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
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 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
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 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 159c0a7165 moer cppcheck fixes 2017-11-17 07:52:26 -05:00
Isaac Connor c3cfd096c7 Don't connect to the monitor when doing an eventStream 2017-11-07 09:34:47 -05:00
Isaac Connor 62d6394923 finish roughing in ffmpeg_input 2017-06-26 16:55:49 -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