Peter Keresztes Schmidt
8f980a1168
Convert NULL/0 to nullptr
...
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
Andrew Bauer
09b12a7dac
Remove extra space in event name
2020-08-13 10:51:10 -05:00
Isaac Connor
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
Isaac Connor
d8cd4386cf
rename GetOptEncoderParams to GetOptEncoderParams to GetOptEncoderParamsVec so that we can get at the std::string if we want to.
...
Use EncoderParams when setting movflags in VideoStore.
Move the content of this option to a help popup so that we can remove the comments from it. av_dict_parse doesn't handle the hash tag as a comment.
2020-07-30 15:06:05 -04:00
Isaac Connor
4f3b6a063e
don't cast fps to an int... values like 2.038 become 1.
2020-07-23 16:08:57 -04:00
Isaac Connor
7aa46df50f
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-07-23 12:05:32 -04:00
Isaac Connor
09d02e94d9
fix lack of c_str on path
2020-07-23 11:53:54 -04:00
Isaac Connor
172eaad8bd
fix capture jpeg saving due to use of std::string
2020-07-22 22:45:11 -04:00
Isaac Connor
13e8ed1924
Clean up code that updates event with video_name. Fix video_file assignment missing /
2020-07-21 16:34:46 -04:00
Isaac Connor
2eec85eaff
Convert use of char path[PATH_MAX] to std::string. Fixes potential overflows, quiets compile, should reduce ram quite a bit and might event be faster. Code is also more readable.
2020-07-21 16:10:05 -04:00
Isaac Connor
3d278eddf8
erge branch 'master' into batch_frame_records
2020-05-08 20:16:36 -04:00
Pliable Pixels
30d45aee8f
formatting/comment
2020-03-13 15:11:00 -04:00
Pliable Pixels
dd76ee2c9f
spacing
2020-03-13 15:01:19 -04:00
Pliable Pixels
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
Isaac Connor
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
Isaac Connor
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
Selva Nair
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
Isaac Connor
21df2c6ac7
Always write snapshot.jpg and alarm.jpg instead of only when using video storage
2019-10-30 16:25:09 -04:00
Isaac Connor
30b5612691
fix case of sql
2019-09-28 12:57:00 -04:00
Isaac Connor
c8934dac7f
Remove useless debug
2019-09-17 10:30:00 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
50436c5ea1
Correct debug line listing how many frames are being written to db
2019-06-10 13:59:01 -04:00
Isaac Connor
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
Isaac Connor
a16d29740c
Fix final frame of event having same id as the second last
2019-06-06 13:49:01 -04:00
Isaac Connor
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
Isaac Connor
bc62493096
Increase sql buffer space because we are using path strings that are PATH_MAX size.
2019-04-04 12:55:35 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
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
Isaac Connor
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
Isaac Connor
89c9a28614
Merge branch 'master' into storageareas
2018-12-14 12:25:06 -05:00
Isaac Connor
ad4f131284
Must unlock before logging
2018-12-14 12:22:10 -05:00
Isaac Connor
0bfe1007c8
Merge branch 'master' into storageareas
2018-12-14 10:16:08 -05:00
Isaac Connor
1a05e777c0
fix path not being constructed properly for shallow event storage
2018-12-14 08:54:29 -05:00
Andrew Bauer
22460f580b
Merge pull request #2305 from pliablepixels/save-first-alarm
...
Save first alarm
2018-12-11 09:35:40 -06:00
Isaac Connor
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
Isaac Connor
87140ecdb5
white space and quiet warning
2018-11-17 10:39:42 -05:00
Pliable Pixels
01a57222d3
keep track if we have written alarmed frame incase savejpeg is off
2018-11-12 12:43:20 -05:00
Isaac Connor
89cd7ceaf8
Whitespace, extra parentheses, google code style
2018-09-23 16:47:06 -04:00
Isaac Connor
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
Isaac Connor
cc417cf3e7
reverse order of tests to be more efficient
2018-09-11 13:19:33 -04:00
Isaac Connor
a0e67da51d
Improve loging around writing out analysis frames
2018-08-02 15:40:33 -04:00
Isaac Connor
e831c1563d
pretty the code structure
2018-05-24 10:59:26 -04:00
Isaac Connor
dc5ccd04ef
Update thumbnail with high scoring image.
2018-05-22 11:31:03 -04:00
Isaac Connor
375af59657
use unsigned for formatting
2018-05-04 09:58:22 -04:00
Isaac Connor
6d5e46e91f
whitspace
2018-05-03 13:54:05 -04:00
Isaac Connor
d8b461806a
fix StartTime in the future log
2018-05-02 11:37:54 -04:00
Isaac Connor
2845f891bc
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-30 10:12:41 -04:00
Isaac Connor
e55846e716
Log start_time when its > Now
2018-04-30 10:12:34 -04:00
