cd9b3fb1f6
add static Mode_Strings
2021-01-26 12:21:21 -05:00
5d32e0faf0
cppcheck fixes. Make curr_frame_id signed as we may subtract from it and go < 0
2020-11-02 12:45:19 -05:00
80e54aee66
cppcheck improvements. Add const and override where we can
2020-11-01 17:15:17 -05:00
4afae7b738
More accurate seeking, remove debug and duplicated code. Correct type of curr_frame_id to match frame_count.
2020-10-08 11:13:18 -04:00
9cc7f0d360
Merge branch 'release-1.34'
2020-10-08 09:28:25 -04:00
c28ff1f2b4
Include loading EndTime when loading Events data so that we can determine if an event is in-progress
...
Keep track of last_id which is the last frame id that we have info for. Use it instead of Frame Count to prevent
accessing non-existent frame records
close ffmpeg_input on event change
include duration in status messages because it may change when playing an in-progress event.
when we hit the end of our frame data if it is an in-progress event, reload the event data instead of moving to the next event.
Include X-Timestamp in http headers to match live stream behaviour
Only send time to next event when mode=ALL
Fix scale behaviour on event view
2020-10-08 09:06:56 -04:00
4126f96b40
clean up sendFrame a bit introducing send_file and send_buffer utility functions
2020-09-07 11:19:47 -04:00
8f980a1168
Convert NULL/0 to nullptr
...
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
490009446d
fix use of int or unsigned long instead of int for monitor id
2020-07-23 19:32:30 -04:00
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
3675ee1c33
Properly delete FramesData as well.
2020-05-01 09:56:27 -04:00
e21ffbea7d
Merge branch 'fix_zms'
2020-04-26 18:43:39 -04:00
ae9a5766f5
Merge branch 'release-1.34' into fix_zms
2020-04-26 18:19:30 -04:00
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
76d88621ac
clean up Stream and EventStream Object initializers
2020-04-21 08:28:44 -04:00
bc950c9a34
Remove <set> and <map> as they are not used
2020-03-26 15:11:39 -04:00
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
9972a2fd0c
wip work on fixing zms mp4 to mjpeg
2019-12-02 15:51:08 -05:00
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
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
87d1390fed
Merge branch 'storageareas' into h265
2019-01-16 15:20:17 -05:00
345e2fef0f
start only used in eventstream
2019-01-15 16:44:58 -05:00
d973d55d2f
Use SaveJPEGs from the Event record instead of the Monitor Object
2018-11-06 11:45:34 -05:00
a8329465fb
Merge branch 'master' into h265
2018-10-22 10:30:01 -04:00
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
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
fd1c69d48a
switch to uint64_t for event_id because long long can actually be 128 bit
2018-04-17 13:51:20 -04:00
f9f78e9aa3
Convert event_id to a 64bit unsigned int
2018-04-12 13:40:11 -07:00
a6827c97ab
Cleanup, add some sanity checks
2018-03-02 18:24:39 -08:00
2922a86d23
fixes to new Storage Schemes code
2017-12-19 11:01:03 -05:00
159c0a7165
moer cppcheck fixes
2017-11-17 07:52:26 -05:00
c3cfd096c7
Don't connect to the monitor when doing an eventStream
2017-11-07 09:34:47 -05:00
9fa48954db
more work
2017-07-18 22:30:22 -04:00
62d6394923
finish roughing in ffmpeg_input
2017-06-26 16:55:49 -04:00
b73c0ba978
rough in zm_ffmpeg_input and split out eventstream
2017-06-22 17:58:32 -04:00
c241b6dddd
Merge branch 'split_zmeventstream' into storageareas
2017-06-22 10:46:32 -04:00
394001604d
add the new files for EventStream
2017-06-22 10:12:04 -04:00
Isaac Connor
Isaac Connor
Peter Keresztes Schmidt
Isaac Connor