869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
3d278eddf8
erge branch 'master' into batch_frame_records
2020-05-08 20:16:36 -04:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
30d45aee8f
formatting/comment
2020-03-13 15:11:00 -04:00
dd76ee2c9f
spacing
2020-03-13 15:01:19 -04:00
6b61f4ac84
when an event is created, write video name if applicable so image.php can extract frames while recording is in progress
2020-03-13 14:47:22 -04:00
81f8f85be5
Revert "use CONCAT when updating event notes so that we don't overwrite notes set by other processes."
...
This reverts commit a90033e026
2020-02-25 16:38:31 -05:00
a90033e026
use CONCAT when updating event notes so that we don't overwrite notes set by other processes.
2020-02-25 14:16:30 -05:00
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
50986ce3b4
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2019-11-30 13:53:05 -05:00
5260563ec4
Update frame deltas in the database to be relative to the video start time
...
Currenltly the frames written to database have delta time measured
from the event start time. As these deltas are also used to generate
any frame on the fly from the recorded video, these should be relative
to the video start time.
Adjust by subtracting the offset of the video start from event start.
Done when the event is closed.
If video is not stored, this has no effect.
Signed-off-by: Selva Nair <selva.nair@gmail.com>
2019-11-15 21:55:40 -05:00
21df2c6ac7
Always write snapshot.jpg and alarm.jpg instead of only when using video storage
2019-10-30 16:25:09 -04:00
30b5612691
fix case of sql
2019-09-28 12:57:00 -04:00
c8934dac7f
Remove useless debug
2019-09-17 10:30:00 -04:00
505a041c88
Don't add a final db frame to the event, because there is no jpg for the frame. I don't know why this code was originally added.
2019-08-28 10:17:23 -04:00
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
ee80b086af
log the # of db entries being written before doing the writing so that we know the # being written
2019-06-10 14:13:21 -04:00
50436c5ea1
Correct debug line listing how many frames are being written to db
2019-06-10 13:59:01 -04:00
ebc9a77c9d
When saving jpegs, do a db write on the first frame. Fix test for writing frame info to db. Because we increment frames, it is essentially 1-based. So the test needs to be ==1 instead of !
2019-06-10 12:57:57 -04:00
a16d29740c
Fix final frame of event having same id as the second last
2019-06-06 13:49:01 -04:00
8bbcf0f631
merge storageareas
2019-04-25 14:49:16 -04:00
077ad75516
Merge branch 'storageareas' into origin/zma_to_thread
2019-04-25 12:41:48 -04:00
96b7d30d7d
Merge branch 'master' into zma_to_thread
2019-04-15 10:47:26 -04:00
f719dd9acc
always commit buffered db_frames when we have a new max score image or alarm cause image
2019-04-07 10:29:02 -04:00
bc62493096
Increase sql buffer space because we are using path strings that are PATH_MAX size.
2019-04-04 12:55:35 -04:00
f6d5038586
we only use event_file if we are writing out a jpg, so only generate the event_file string if we are writing out jpgs
2019-04-04 12:37:25 -04:00
271937f005
store the snapshot_file and alarm_file strings in the boject during construction so that we don't have to do it everytime we write out an image
2019-04-04 12:28:08 -04:00
279e0d8bcf
Merge branch 'storageareas' into zma_to_thread
2019-02-22 11:39:58 -05:00
c626b0fb8e
if adding a closing frame, queue it with the rest of the frames so they get written all at once. Queue 20 frames instead of 10
2019-02-19 12:00:17 -05:00
28dafd5931
Merge branch 'storageareas' into zma_to_thread
2018-12-26 12:02:00 -05:00
19e4ef99bc
add get_fps to Monitor and use it to adjust the # of frames to cache before writing to db
2018-12-16 16:22:25 -05:00
89c9a28614
Merge branch 'master' into storageareas
2018-12-14 12:25:06 -05:00
ad4f131284
Must unlock before logging
2018-12-14 12:22:10 -05:00
0bfe1007c8
Merge branch 'master' into storageareas
2018-12-14 10:16:08 -05:00
1a05e777c0
fix path not being constructed properly for shallow event storage
2018-12-14 08:54:29 -05:00
22460f580b
Merge pull request #2305 from pliablepixels/save-first-alarm
...
Save first alarm
2018-12-11 09:35:40 -06:00
ab9081e1bf
create a simple Frame class. Add a queue of Frames to the Event. When we get 10 of them write them out to the db.
2018-12-05 13:18:21 -05:00
87140ecdb5
white space and quiet warning
2018-11-17 10:39:42 -05:00
01a57222d3
keep track if we have written alarmed frame incase savejpeg is off
2018-11-12 12:43:20 -05:00
5ab1126260
Merge branch 'storageareas' into zma_to_thread
2018-10-20 17:31:14 -04:00
89cd7ceaf8
Whitespace, extra parentheses, google code style
2018-09-23 16:47:06 -04:00
7abe4c40d5
Merge branch 'fix_2213' into storageareas
2018-09-19 20:02:27 -04:00
c8b10b2e3b
factor out some common code when creating the event directory and add a mkdir for creating the monitor directory. Should make event writing more robust when monitor dirs do not exist for some reason.
2018-09-19 19:50:26 -04:00
60b952ab86
Merge branch 'master' into storageareas
2018-09-13 16:20:36 -04:00
cc417cf3e7
reverse order of tests to be more efficient
2018-09-11 13:19:33 -04:00
672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -04:00
96a1ac14e8
Don't do all the event notes stuff if notes is empty
2018-08-17 16:02:40 -04:00
b2c9c2961d
spacing, code style, remove useless debug logging
2018-08-11 18:49:30 -04:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
Isaac Connor
Isaac Connor
Pliable Pixels
Selva Nair
Andrew Bauer