Isaac Connor
|
b1054a7db6
|
bail earlier if writing content-length fails. Dropped connections aren't really errors, make them Info. Fixes #2996
|
2020-07-29 13:39:00 -04:00 |
|
Isaac Connor
|
24aaeee155
|
dynamically load monitor Object when loading event data. Also dynamically load Storage, but only when the Id is different. Free the various objects in the destructor. Sync up some spacing issues with master.
|
2020-05-01 18:44:35 -04:00 |
|
Isaac Connor
|
2071b2a71e
|
Guess video file name for in progress events
|
2020-05-01 18:14:58 -04:00 |
|
Isaac Connor
|
3b11258fbc
|
Make checkEventLoaded return true if a new event was loaded, false otherwise. The idea is to give more information back to whoever calls it
|
2020-04-26 15:22:29 -04:00 |
|
Isaac Connor
|
5bf068791b
|
Merge branch 'rate_dropdown' into release-1.34
|
2020-04-23 16:11:59 -04:00 |
|
Isaac Connor
|
45299955a1
|
Fix SLOW FWD not working
|
2020-03-26 12:21:42 -04:00 |
|
Isaac Connor
|
84d719f2dd
|
Merge branch 'release-1.34' into rate_dropdown
|
2020-03-10 16:06:11 -04:00 |
|
Isaac Connor
|
f4521d20e0
|
Fix applying rotation to x264encoded video which has already been rotated.
|
2020-02-24 14:12:10 -05:00 |
|
Isaac Connor
|
4f25426b1f
|
load event orientation as well and if it's an mp4 do the rotation on the image before outputting. Fixes #2829
|
2020-02-10 16:22:01 -05:00 |
|
Isaac Connor
|
1bdabefb2d
|
fix single stepping in reverse but actually modifying curr_frame_id
|
2020-01-07 17:07:35 -05:00 |
|
Isaac Connor
|
1c197db619
|
Merge branch 'master' into rate_dropdown
|
2020-01-07 14:49:58 -05:00 |
|
Isaac Connor
|
4a82ce83a7
|
quit a bit earlier when stream is broken.
|
2019-08-20 11:13:38 -04:00 |
|
Isaac Connor
|
efa264e0c7
|
Fix playing in reverse. Fix not sending first frame. Fix sql problem with backticks. Not being able to open a frame image is now non-fatal.
|
2019-08-16 10:24:51 -04:00 |
|
Isaac Connor
|
c7b6db9be7
|
Put backticks around all columns and tables in sql to deal with mysql 8
|
2019-08-14 16:18:21 -04:00 |
|
Isaac Connor
|
4b89ced889
|
Warn about waiting more than .5s instead of .1
|
2019-07-26 12:24:36 -04:00 |
|
Isaac Connor
|
3da12fd141
|
Add a bunch of debugging
|
2019-07-26 12:21:15 -04:00 |
|
Isaac Connor
|
0643108ba4
|
Use fputs instead of fprintf. Spacing and google code style changes
|
2019-07-26 10:53:48 -04:00 |
|
Isaac Connor
|
049b70a624
|
junk bad code in zm_eventstream that tried to figure out how long to sleep by considering the wall clock time since play start. No good as soon as we seek.
|
2019-05-27 17:15:46 -04:00 |
|
Isaac Connor
|
67b8ca8bfb
|
Fix superfast playback after replay
|
2019-05-24 13:45:48 -04:00 |
|
Isaac Connor
|
dde911d16a
|
add more debug about command queue
|
2019-03-18 10:55:21 -04:00 |
|
Isaac Connor
|
9b713a489d
|
fix sleep time by using a comparison between the frame display time and the distance between now and when we started playing.
handle infinite fps
|
2019-03-06 14:50:36 -05:00 |
|
Isaac Connor
|
6c8eac1ac8
|
Merge branch 'storageareas' into h265
|
2019-03-06 11:10:01 -05:00 |
|
Isaac Connor
|
95567e07a4
|
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
|
2019-02-26 11:43:07 -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
|
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 |