Bluemax
d8993931da
Improve group permissions (mode 660)
...
Make /dev/shm files 660.
2020-12-02 21:27:00 +01:00
Isaac Connor
617a1faa99
Add pre-alarm frames when alarm_frame_count > 1 and prealarmcount=0
2020-10-19 13:25:26 -04:00
Isaac Connor
eefbed04c1
Add debugging for min_section_length keeping us in ALERT
2020-10-19 13:24:30 -04:00
Isaac Connor
df2f5f814b
fix case in mocord where cause would not contain motion
2020-10-19 13:24:08 -04:00
Isaac Connor
cc24df9593
init shared_data in the purpose=QUERY case to prevent crash. Also don't load zones if we don't need them
2020-10-19 13:23:40 -04:00
Isaac Connor
06c8ce57c2
Make zm_terminate available to anyone who includes zm.h
2020-10-16 20:06:53 -04:00
Isaac Connor
2f06a79ad8
fix compiler warnings
2020-10-16 20:04:26 -04:00
Isaac Connor
86e744777c
Put back return on error
2020-10-08 09:12:37 -04:00
Isaac Connor
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
Isaac Connor
7cc023c1ec
Update Event details when writing Frame Data. Write Frame Details when inserting a Bulk Frame
2020-10-07 18:37:38 -04:00
Isaac Connor
044ce61ddb
Always do event change detection whether we are paused or not. Because we might be single-stepping. Change progress to a double as that it what it should be.
2020-10-06 16:47:51 -04:00
Isaac Connor
061c889394
Implement SEEK to offset using two 32bit integers to represent the double value
2020-10-06 16:35:46 -04:00
Isaac Connor
b27eac3cbf
Make centerCoord take a font size parameter to fix centering when using large font.
2020-10-05 16:12:48 -04:00
Isaac Connor
1c2dd92d31
Add LabelSize to get label_size from monitor
2020-10-05 16:12:33 -04:00
Isaac Connor
93ecb87caa
Clear the textframe before Annotating it.
2020-10-05 16:12:09 -04:00
Isaac Connor
c1c407ea39
debug new offset as well when SEEKING
2020-10-05 15:55:42 -04:00
Isaac Connor
2f03ceeccf
log referer when unable to authenticate
2020-09-22 13:10:39 -04:00
Isaac Connor
e5dda8d142
Include avutils/imgutils.h to support compile on libav-tools
2020-08-16 14:56:52 -04:00
Isaac Connor
afae319c94
Fix MOCORD not going into ALARM state.
2020-08-11 11:02:26 -04:00
Isaac Connor
302189a65e
Don't use camera->LineSize when allocating shared images. It doesn't work because other processes don't know about it.
2020-08-06 10:11:00 -04:00
Isaac Connor
be05040a47
fix rotated images
2020-07-30 19:50:25 -04:00
Isaac Connor
05107bb2f7
Add debug of unused options
2020-07-30 15:16:31 -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
4ed0ad26a7
bail early if fwrite fails
2020-07-29 14:01:52 -04:00
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
7e6c637ec3
Unexpected colours while bad should only cause failure to annotate, not panic
2020-07-22 11:34:54 -04:00
Isaac Connor
5c844f9cae
remove extra space
2020-07-20 10:22:40 -04:00
Isaac Connor
01892352da
rename sseversion to sse_version
2020-07-19 17:50:47 -04:00
Isaac Connor
6b39f59b3a
use delete[] instead of delete.
2020-07-16 16:00:23 -04:00
Isaac Connor
2c056c188f
Fix compile on old ffmpeg
2020-07-16 15:59:08 -04:00
Isaac Connor
4e2732e12d
Priming capture logs should be debug not Info
2020-07-16 15:51:24 -04:00
Isaac Connor
a7b76dfe41
Remove debug
2020-07-16 15:48:09 -04:00
Isaac Connor
0a6321ee56
Update linesize when using AssignDirect. Fixes #2979
2020-07-16 15:48:06 -04:00
Isaac Connor
d849ee54a4
Update state to ALARM AFTER we have opened the event, so that we get the correct event Id. Fixes #2978 Fixes #2894
2020-07-16 15:47:01 -04:00
Isaac Connor
9b447bde8e
remove extra {
2020-07-07 18:56:51 -04:00
Isaac Connor
916d1ed59e
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-07-07 16:15:23 -04:00
Isaac Connor
c79c65e72e
spacing fixes
2020-07-07 16:14:57 -04:00
Isaac Connor
af74ecac4c
Pass along the image linesize to Image constructors so that Image knows about the requirement for it to be 32byte aligned.
2020-07-07 16:14:38 -04:00
Isaac Connor
fd9272241a
Introduce constructors that can be passed a linesize which is the # of bytes to use to store a line of image. This can be different from the image width * colours as it should be 32byte aligned for use with sws_scale.
2020-07-07 16:13:41 -04:00
Isaac Connor
cae8978501
add an alignment variable to ffmpeg_camera to use wherever we want to tell ffmpeg about the buffer and linesize alignment. Figure out linesize in the constructor so that zm_monitor can pass the info along to zm_image.
2020-07-07 16:12:14 -04:00
Isaac Connor
533876f313
rewrite code to use fewer lines. No logic change.
2020-07-07 09:16:42 -04:00
Isaac Connor
864cd4c178
introduce a linesize variable which represents the # of bytes to hold a line of the image in the buffer. May be > width * colours
2020-07-05 17:51:57 -04:00
Isaac Connor
e137e1dacf
Don't consult EVENT_CLOSE_MODE if mode is RECORD
2020-06-26 19:30:35 -04:00
Isaac Connor
728f41fe9c
Log @debug when a linked monitor is disconnected. Use ZM_MAX_RESTART_DELAY instead of hard coded 60 seconds before next reconnect attempt
2020-06-23 16:56:35 -04:00
Isaac Connor
31a3be5c8e
check shared_data->valid when checking if LinkedMonitor is connected
2020-06-23 15:05:17 -04:00
Isaac Connor
2637c887f8
Fix segfault when timestamp contains an unimplemented character. Fixes #2943
2020-05-29 11:44:34 -04:00
Isaac Connor
9ea1c637f9
Remove debug Exiting message
2020-05-15 11:48:41 -04:00
Isaac Connor
7a85be59be
Remove errant closing db debug output
2020-05-15 10:22:58 -04:00
Isaac Connor
25a772c5eb
reorder logic a bit to make it easier to read. Make exit_zmu not return a value.
2020-05-14 12:02:02 -04:00
Isaac Connor
16e7ca5a51
failure opening a monitor should not be fatal.
2020-05-14 12:01:24 -04:00