9abde9ee06
Merge branch 'release-1.34'
2020-10-06 16:51:12 -04:00
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
061c889394
Implement SEEK to offset using two 32bit integers to represent the double value
2020-10-06 16:35:46 -04:00
b27eac3cbf
Make centerCoord take a font size parameter to fix centering when using large font.
2020-10-05 16:12:48 -04:00
1c2dd92d31
Add LabelSize to get label_size from monitor
2020-10-05 16:12:33 -04:00
93ecb87caa
Clear the textframe before Annotating it.
2020-10-05 16:12:09 -04:00
c1c407ea39
debug new offset as well when SEEKING
2020-10-05 15:55:42 -04:00
c43011ba18
don't send keepalive when we have sent a textFrame
2020-10-05 13:33:57 -04:00
71085d9724
Clear the textframe before Annotating it.
2020-10-05 13:16:22 -04:00
5dd83d41fa
Add LabelSize to get label_size from monitor
2020-10-05 13:15:58 -04:00
059d7d388f
Make centerCoord take a font size parameter to fix centering when using large font.
2020-10-05 13:15:39 -04:00
6c24cd0c70
When playing backwards, say time to previous event instead of next. Instead of defaulting to -2x when hitting the rewind button, start with -1x.
2020-10-05 13:14:44 -04:00
419a03db25
Add debugging for min_section_length keeping us in ALERT
2020-10-05 12:11:39 -04:00
c5459020c9
implement value check & correct on replay_rate for VARPLAY
2020-10-05 12:11:11 -04:00
7a7a3413d3
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-05 10:29:42 -04:00
283f224a95
Add pre-alarm frames when alarm_frame_count > 1 and prealarmcount=0
2020-10-05 09:19:48 -04:00
3570c6e828
Better debug logging of event and frame inserts
2020-10-05 09:11:16 -04:00
07d0353373
Fix zms only sending 1 frame due to != instead of ==
2020-10-03 11:57:22 -04:00
387f5dd397
Fix double free of image
2020-10-02 12:47:05 -04:00
5d0c812dfb
fix resource leak on error
2020-10-02 12:46:53 -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
795e98a09c
Merge pull request #2916 from connortechnology/zone_optimise
...
Improve code in zm_zone
2020-09-22 17:48:24 -04:00
2f03ceeccf
log referer when unable to authenticate
2020-09-22 13:10:39 -04:00
98aad6abbc
Make status UNKNOWN be -1 so that zmu -s retains backwards compatibility. Fixes #3048
2020-09-21 14:25:41 -04:00
d843ef89f6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-09 15:07:46 -04:00
30e9924601
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-09 12:55:13 -04:00
53fe4c7f1b
Handle error conditions
2020-09-09 12:55:08 -04:00
a4b83b0e99
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-09-09 12:13:54 -04:00
6bfd7c5e14
log referer when unable to authenticate
2020-09-09 12:13:28 -04:00
7b52237593
spacing and correct a libvlc=>libvncclient
2020-09-09 10:25:55 -04:00
eadd9dd4f4
spacing
2020-09-07 13:28:45 -04:00
4126f96b40
clean up sendFrame a bit introducing send_file and send_buffer utility functions
2020-09-07 11:19:47 -04:00
f3873d65e4
remove debug
2020-09-02 17:33:38 -04:00
77b978ed26
Handle non-connected monitor in processCmd. Quit when zm_terminate in checkInitiialized loop
2020-09-02 17:22:39 -04:00
794474afab
Add UNKNOWN status type. test for shared_data in ShmValid()
2020-09-02 17:22:00 -04:00
3a9cec8e4d
We no longer care about not being able to connect to the monitor.
2020-09-02 16:37:11 -04:00
ea3fcb16a6
Changes to not just die if not connected to monitor. Instead wait around spitting out an error image.
2020-09-02 16:36:05 -04:00
43e1ac2ad4
Send Text frame when unable to connect to the monitor.
2020-09-02 16:35:27 -04:00
f60d6ff1a3
Use BOUNDARY instead of ZoneMinderFrame
2020-09-02 16:34:56 -04:00
4d5d2ecd5d
Merge pull request #3030 from Carbenium/nullptr
...
Convert NULL/0 to nullptr
2020-08-26 16:54:28 -04:00
8f980a1168
Convert NULL/0 to nullptr
...
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
06dfe9b987
Extract generated part of zm_config.h into zm_config_data.h
...
With this change IDEs have it easier to correctly reference the
variable/class declarations. Additionally one does not have to
regenerate the zm_config.h file when changing the code.
2020-08-25 23:33:56 +02:00
394426cca2
zm_config: Fix a -Wwrite-string warning
...
For reference:
/home/peterke/DEV/zoneminder/build/src/zm_config.h:31:26: warning: ISO C++ forbids converting a string constant to ‘char*’ [-Wwrite-strings]
2020-08-25 20:51:42 +02:00
e5e2c3b347
fix stats off by 1 frame, don't alert on score 0
2020-08-24 10:57:54 -05:00
08aee63f66
Don't need a variable can just pass the define
2020-08-22 11:36:07 -04:00
2773737e54
Use gcc builtin functions for cpuid
2020-08-19 16:57:20 -04:00
a0bc60ceda
change not enabling ffmpeg msg to debug
2020-08-18 10:34:07 -05:00
ccda2b3707
EPIPE sets zm_terminate so no need to check
2020-08-18 09:37:21 -05:00
62d687adfa
dont warn or error for EPIPE errno's
2020-08-18 09:30:06 -05:00
610f73a835
Merge branch 'release-1.34'
2020-08-17 19:30:32 -04:00
e5dda8d142
Include avutils/imgutils.h to support compile on libav-tools
2020-08-16 14:56:52 -04:00
09b12a7dac
Remove extra space in event name
2020-08-13 10:51:10 -05:00
d42424d6d8
Merge branch 'release-1.34'
2020-08-11 11:41:11 -04:00
afae319c94
Fix MOCORD not going into ALARM state.
2020-08-11 11:02:26 -04:00
bf2cb5fb1f
Add PrimeCapture to zm_remote_camera_http. PrimeCapture is used to determine if we can connect and so by not implementing it, monitors like this say capturing even though they are not.
2020-08-08 10:21:06 -04:00
98f315951e
Merge pull request #3003 from marillat/patch-1
...
Don't prefix manpage with zoneminder-
2020-08-07 12:34:30 -07:00
ed496e74fc
Update CMakeLists.txt
2020-08-07 07:54:58 +02:00
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
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
4d4fab46d6
Spacing, use FFMpegInit instead of deprecated ffmpeg calls
2020-08-05 19:17:00 -04:00
b867d0c463
Fix image copy when line sizes are not the same.
2020-08-05 11:33:22 -04:00
be05040a47
fix rotated images
2020-07-30 19:50:25 -04:00
05107bb2f7
Add debug of unused options
2020-07-30 15:16:31 -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
2f57ccc9b9
Merge branch 'release-1.34'
2020-07-29 16:27:01 -04:00
4ed0ad26a7
bail early if fwrite fails
2020-07-29 14:01:52 -04:00
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
7511b1fd7e
Fix for saving jpegs
2020-07-25 14:25:45 -04:00
859428db51
remove debug
2020-07-24 15:42:53 -04:00
f4a0f91d7f
nothing
2020-07-24 15:27:05 -04:00
1f889bd086
def don't use linesize when allocating share images
2020-07-24 15:26:48 -04:00
4ecfa32601
remove uneccessary multiplications from jpeg compression.
2020-07-24 15:26:28 -04:00
0e9da28a97
Don't pass linesize to shared images. Shared images have to have a contiguous chunk of memory.
2020-07-24 12:48:38 -04:00
0a9fdb4eb3
Fix second jump by matching final WriteJpeg destination. Just use linesize instead of assigning to row_stride
2020-07-24 12:41:27 -04:00
d9a9aeef1d
if linesizes don't match, allocate a frame buffer and use that when sws_scaleing and then copy to the image buffer.
2020-07-24 12:37:24 -04:00
490009446d
fix use of int or unsigned long instead of int for monitor id
2020-07-23 19:32:30 -04:00
559fe15e3f
fix use of int or unsigned long instead of int for monitor id
2020-07-23 19:32:25 -04:00
e9681fcdcf
fix use of int or unsigned long instead of int for monitor id
2020-07-23 19:31:12 -04:00
ee4d90d906
remove debug
2020-07-23 17:15:43 -04:00
cceb010048
set linesize in WriteBuffer which also sets colours, width, etc. Fixes segfault when streaming from jpegs
2020-07-23 17:14:56 -04:00
4f3b6a063e
don't cast fps to an int... values like 2.038 become 1.
2020-07-23 16:08:57 -04:00
e3a2099ca8
fix crash because we weren't setting alarm status
2020-07-23 16:08:35 -04:00
18272b9587
add debug for prealarmcount
2020-07-23 12:05:53 -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
27fed8b227
spacing
2020-07-23 11:53:33 -04:00
172eaad8bd
fix capture jpeg saving due to use of std::string
2020-07-22 22:45:11 -04:00
1416bc547e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-22 17:37:52 -04:00
f635afe00f
spacing
2020-07-22 17:30:39 -04:00
07165aed98
mostly spacing. Also set new_size from line_size in Assign(Image&) and set linesize in the assigned image
2020-07-22 17:30:28 -04:00
7e6c637ec3
Unexpected colours while bad should only cause failure to annotate, not panic
2020-07-22 11:34:54 -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
f217ab54a3
When event_close_mode == CLOSE_ALARM and so we want to close the recording and start a new one, don't do it when alarm_frame_count > 1 until alarm_frames > alarm_frame_count. I believe this fixes a mem leak
2020-07-21 16:17:46 -04:00
f593261136
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:16:16 -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
785087022d
Clear PerAlarmFrames on shutdown
2020-07-20 21:09:07 -04:00
a0be7b1fcb
fixup EmptyPreAlarmFrames
2020-07-20 21:02:49 -04:00
41dfb8ae38
fix duplicate jpeg_create_compress memleak
2020-07-20 21:02:06 -04:00
d716d1d686
Merge branch 'release-1.34'
2020-07-20 16:25:41 -04:00
5c844f9cae
remove extra space
2020-07-20 10:22:40 -04:00
01892352da
rename sseversion to sse_version
2020-07-19 17:50:47 -04:00
6b39f59b3a
use delete[] instead of delete.
2020-07-16 16:00:23 -04:00
2c056c188f
Fix compile on old ffmpeg
2020-07-16 15:59:08 -04:00
4e2732e12d
Priming capture logs should be debug not Info
2020-07-16 15:51:24 -04:00
a7b76dfe41
Remove debug
2020-07-16 15:48:09 -04:00
0a6321ee56
Update linesize when using AssignDirect. Fixes #2979
2020-07-16 15:48:06 -04:00
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
a8e46feb12
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-16 15:42:56 -04:00
3658c3b589
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:36:26 -04:00
c2a025300f
Remove debug
2020-07-16 15:34:29 -04:00
9e06385f26
Update linesize when using AssignDirect. Fixes #2979
2020-07-16 14:50:50 -04:00
9b05337e57
Priming capture logs should be debug level, especially if they ar egoing to log passwords
2020-07-13 15:03:04 -04:00
880219bb0f
Merge branch 'release-1.34'
2020-07-07 18:58:32 -04:00
9b447bde8e
remove extra {
2020-07-07 18:56:51 -04:00
e675c8373e
Merge branch 'release-1.34'
2020-07-07 16:15:56 -04:00
916d1ed59e
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-07-07 16:15:23 -04:00
c79c65e72e
spacing fixes
2020-07-07 16:14:57 -04:00
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
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
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
209cbe1000
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-07 09:23:46 -04:00
acf8a30434
Merge branch 'release-1.34'
2020-07-07 09:22:56 -04:00
533876f313
rewrite code to use fewer lines. No logic change.
2020-07-07 09:16:42 -04:00
dcab218a2e
remove global config item CREATE_ANALYSIS_IMAGES
2020-07-06 12:22:41 -05:00
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
2eac69dd88
fix duplicate extrapad names
2020-07-04 17:16:43 -04:00
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
e137e1dacf
Don't consult EVENT_CLOSE_MODE if mode is RECORD
2020-06-26 19:30:35 -04:00
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
31a3be5c8e
check shared_data->valid when checking if LinkedMonitor is connected
2020-06-23 15:05:17 -04:00
7354b4d30f
Fix compile on old ffmpeg
2020-06-23 14:43:11 -04:00
a15aace2fb
introduce shared_data->zmc_heartbeat_time and zma_heartbeat_time.
2020-06-22 10:40:00 -04:00
4d020bab56
spacing
2020-06-22 10:39:29 -04:00
ae5116ff9c
improve efficiency of outputting device query. The constant strlen's were terrible.
2020-06-15 15:29:26 -04:00
bd287d7c7c
Fix segfault when timestamp contains an unimplemented character. Fixes #2943
2020-05-29 11:45:38 -04:00
2637c887f8
Fix segfault when timestamp contains an unimplemented character. Fixes #2943
2020-05-29 11:44:34 -04:00
662b9894bd
Don't delete send_image because it is static. Fixes #2923
2020-05-23 16:12:55 -04:00
ce9e2c8b27
Merge branch 'release-1.34'
2020-05-15 11:53:09 -04:00
9ea1c637f9
Remove debug Exiting message
2020-05-15 11:48:41 -04:00
6bb2c09a72
Merge branch 'release-1.34'
2020-05-15 11:41:34 -04:00
7a85be59be
Remove errant closing db debug output
2020-05-15 10:22:58 -04:00
d92772343a
Merge branch 'release-1.34'
2020-05-14 12:02:50 -04:00
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
16e7ca5a51
failure opening a monitor should not be fatal.
2020-05-14 12:01:24 -04:00
402c0c6a1b
Fix build on older ffmpeg
2020-05-14 12:01:03 -04:00
efbab4e2bc
Dont' call mysql_library_end as it segfaults and hangs.
2020-05-14 12:00:36 -04:00
bbf64de40e
If there is a failure when decoding due to lack of support for the codec profile, re-init without hwaccel
2020-05-13 08:04:53 -04:00
7e80b33ee0
If there is a failure when decoding due to lack of support for the codec profile, re-init without hwaccel
2020-05-12 15:10:08 -04:00
81cd338545
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-05-11 08:34:19 -04:00
3d278eddf8
erge branch 'master' into batch_frame_records
2020-05-08 20:16:36 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Peter Keresztes Schmidt
Andrew Bauer
dmo