23f27d5a11
include frame_type in debug message
2020-11-13 12:43:31 -05:00
08a8155b47
Implement a Monitor::disconnect function. Fix Fatals during connect and cleanup Analysis Monitor code to wait around for zmc. Handle zmc going away gracefully. Fixes a slow zma startup due to zmc not being setup yet.
2020-11-13 12:27:51 -05:00
ad4d0efba6
121 frames is too many, use >= instead
2020-11-12 17:00:32 -05:00
de74a15ab1
Move diag_fifo pipes in SOCKS_DIR instead of assigned Storage area. Storage areas could be a fs that cannot handle sockets or fifos like NFS.
2020-11-12 11:53:51 -05:00
f91dcc9b60
declar rc as int
2020-11-11 20:05:47 -05:00
9636a76ccf
drop db lock before reporting mysql_errors
2020-11-11 17:42:29 -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
cda3824a25
Use INSERT.. ON DUPLICATE... instead of REPLACE INTO. REPLACE INTO deletes the existing row. Since we now have event counts in there, we lose them.
2020-11-10 12:33:10 -05:00
27f336975c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-05 18:12:43 -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
a857f677a6
cppcheck fixes, mostly %d->%u
2020-11-02 12:45:48 -05:00
5d32e0faf0
cppcheck fixes. Make curr_frame_id signed as we may subtract from it and go < 0
2020-11-02 12:45:19 -05:00
ed87ad36b3
missing break
2020-11-02 12:09:25 -05:00
4e80c04d23
fix lack of const to match def
2020-11-01 18:48:13 -05:00
5b918e69f1
spacing
2020-11-01 17:16:19 -05:00
033e749a57
improve code logic/spacing
2020-11-01 17:16:07 -05:00
296f6af7fb
Remove dirty hack that sets EndTime from monitor. It can get set in event destructor
2020-11-01 17:15:42 -05:00
80e54aee66
cppcheck improvements. Add const and override where we can
2020-11-01 17:15:17 -05:00
82c3436155
cppcheck improvements. Remove non-const StartTime and EndTime. We will remove the dirty hack use in zm_monitor.
2020-11-01 17:14:44 -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
a04f6df06a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-31 10:47:25 -04:00
a63600ccef
remove dead code
2020-10-30 16:09:24 -04:00
e5097d9466
code style
2020-10-30 11:50:16 -04:00
f3f0a6baff
remove debug
2020-10-26 18:48:43 -04:00
617a1faa99
Add pre-alarm frames when alarm_frame_count > 1 and prealarmcount=0
2020-10-19 13:25:26 -04:00
eefbed04c1
Add debugging for min_section_length keeping us in ALERT
2020-10-19 13:24:30 -04:00
df2f5f814b
fix case in mocord where cause would not contain motion
2020-10-19 13:24:08 -04:00
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
06c8ce57c2
Make zm_terminate available to anyone who includes zm.h
2020-10-16 20:06:53 -04:00
2f06a79ad8
fix compiler warnings
2020-10-16 20:04:26 -04:00
ae506d94fa
Improve log line telling why we are going into alarm
2020-10-11 10:01:11 -04:00
9768f081e4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-09 10:21:33 -04:00
268e364cfd
handle the paused case
2020-10-09 10:21:00 -04:00
9bfe8c28e4
Merge branch 'gcc_cpuid'
2020-10-09 08:48:01 -04:00
7d1598ae50
Merge branch 'master' into gcc_cpuid
2020-10-09 08:47:30 -04:00
cb38242917
use nullptr when appropriate
2020-10-08 16:46:47 -04:00
2f2562a876
init shared_data in the purpose=QUERY case to prevent crash. Also don't load zones if we don't need them
2020-10-08 16:46:30 -04:00
1aadeb2206
free the context as well.
2020-10-08 16:46:03 -04:00
871c556ac0
rename a variable to be more readable
2020-10-08 16:45:45 -04:00
1173f618ec
turn off negative pts detection... I have cameras that generate them all the time, they might actually be valid
2020-10-08 15:50:52 -04:00
71686fc1f2
fix case in mocord where cause would not contain motion
2020-10-08 15:50:12 -04:00
4afae7b738
More accurate seeking, remove debug and duplicated code. Correct type of curr_frame_id to match frame_count.
2020-10-08 11:13:18 -04:00
9cc7f0d360
Merge branch 'release-1.34'
2020-10-08 09:28:25 -04:00
86e744777c
Put back return on error
2020-10-08 09:12:37 -04:00
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
7cc023c1ec
Update Event details when writing Frame Data. Write Frame Details when inserting a Bulk Frame
2020-10-07 18:37:38 -04:00
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
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Peter Keresztes Schmidt
Andrew Bauer