67f4359242
clean up code giving warning when no starttime is given
2021-01-11 13:46:50 -05:00
00aae0b68f
Use proper c++ initializers
2020-12-30 21:21:59 -05:00
e58c06e60f
Don't need keyframes when saving jpegs.
2020-12-27 12:32:06 -05:00
0521d05295
Can only output jpegs if we are doing decoding.
2020-12-27 11:55:53 -05:00
d89cbebbdf
AddPacket should just take a packet. score and alarm_image are members of the packet
2020-12-22 10:18:15 -05:00
aaea6c6ead
Store endtime for each packet
2020-12-15 15:57:01 -05:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
ff2981b9b3
code style. Remove unused members. Make WriteFrameImage const
2020-12-01 09:53:51 -05:00
159edbfce9
Fix video file having wrong id
2020-11-29 16:25:33 -05:00
95cbc053fc
Try other storage areas if we fail to create event dir on the assigned area.
2020-11-27 13:28:38 -05:00
23f27d5a11
include frame_type in debug message
2020-11-13 12:43:31 -05:00
ad4d0efba6
121 frames is too many, use >= instead
2020-11-12 17:00:32 -05:00
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
f855f207e2
Limit that # of db frames to buffer to 120 because the sql will exceed 8192.
2020-11-11 14:03:08 -05:00
d663683f47
Add a bunch of debug statements to figure out crash
2020-11-11 12:43:41 -05:00
33f58add11
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:49:47 -05:00
09fe354a22
If event db insert fails, try again until it succeeds.
2020-11-04 11:59:08 -05:00
b8bd4b6961
Add fallback for now to endtime. Set endtime in AddFramesInternal as well just in case there was never another frame.
2020-11-02 16:34:00 -05:00
4e80c04d23
fix lack of const to match def
2020-11-01 18:48:13 -05:00
f79602d638
cppcheck improvements. Use %u instead of %d where appropriate. Move sql def to block where it is used
2020-11-01 17:14:04 -05:00
1257a7ea37
improvements reported by cppcheck
2020-11-01 16:11:19 -05:00
aef0cc55eb
fix merge
2020-10-20 18:27:03 -04:00
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
9cc7f0d360
Merge branch 'release-1.34'
2020-10-08 09:28:25 -04:00
7cc023c1ec
Update Event details when writing Frame Data. Write Frame Details when inserting a Bulk Frame
2020-10-07 18:37:38 -04:00
3570c6e828
Better debug logging of event and frame inserts
2020-10-05 09:11:16 -04:00
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
8223d6ed15
When closing event, on first update, only update if Name has not been changed. If so, do the update without setting the Name.
2020-09-25 15:29:31 -04:00
8f980a1168
Convert NULL/0 to nullptr
...
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
09b12a7dac
Remove extra space in event name
2020-08-13 10:51:10 -05:00
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
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
4f3b6a063e
don't cast fps to an int... values like 2.038 become 1.
2020-07-23 16:08:57 -04:00
7aa46df50f
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-07-23 12:05:32 -04:00
09d02e94d9
fix lack of c_str on path
2020-07-23 11:53:54 -04:00
172eaad8bd
fix capture jpeg saving due to use of std::string
2020-07-22 22:45:11 -04:00
3641797500
Merge branch 'master' into zma_to_thread
2020-07-22 13:14:40 -04:00
d23dc42981
fix merge from master, make it compile
2020-07-21 18:48:45 -04:00
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
13e8ed1924
Clean up code that updates event with video_name. Fix video_file assignment missing /
2020-07-21 16:34:46 -04:00
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
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
Isaac Connor
Isaac Connor
Peter Keresztes Schmidt
Andrew Bauer
Pliable Pixels