a3ff81b279
Add zm_rtsp_server_thread.cpp to CMakeLists.txt
2020-12-09 12:20:01 -05:00
054e1b583d
Rough in code for the RTSP Server thread
2020-12-09 12:19:35 -05:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
aaf4b37439
spacing, don't need to set packet.size=0
2020-12-07 15:53:09 -05:00
36b5702c50
Increase LinkedMonitor debugging. Fix LinkedMonitors. Fixes #3091
2020-12-05 19:36:44 -05:00
4d33667a85
Merge branch 'release-1.34'
2020-12-05 16:51:42 -05:00
8012438573
Fix font rendering issue
2020-12-04 05:22:54 +05:30
b2e5df1854
Need to -1 to size parameter when calling SetFontSize
2020-12-03 18:31:41 -05:00
1bbcf4ea31
spacing and make assignments a little more readable/efficient maybe
2020-12-03 16:43:27 -05:00
330327ded0
Improve code readability. Use a define for header size
2020-12-03 16:21:18 -05:00
cfd4c17953
Include invalid font path in the error message
2020-12-03 13:35:12 -05:00
c8aac87f74
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-12-03 10:26:27 -05:00
d8993931da
Improve group permissions (mode 660)
...
Make /dev/shm files 660.
2020-12-02 21:27:00 +01:00
59d5860560
Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into Font
2020-12-02 09:45:16 +05:30
1ec13f3d06
Free font->data only when font itself is valid
2020-12-02 09:44:49 +05:30
ff2981b9b3
code style. Remove unused members. Make WriteFrameImage const
2020-12-01 09:53:51 -05:00
836cd2d58d
Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into font
2020-11-30 09:45:39 -05:00
d290ffc1b3
Set individual rgb components instead of memset which is wrong
2020-11-30 17:57:59 +05:30
159edbfce9
Fix video file having wrong id
2020-11-29 16:25:33 -05:00
32e2563643
Free font data when destructor is called
2020-11-29 10:53:20 +05:30
890a52605f
Satisfy cpplint
2020-11-29 10:25:06 +05:30
bbeb599fce
Remove bigfont
2020-11-28 20:28:34 +05:30
b212b0e450
Allow modifying font file location
2020-11-28 20:18:17 +05:30
0a7b7b9661
Bound check values
2020-11-28 19:44:45 +05:30
528699f942
Use ctzll + new font format for improving drawing speed
2020-11-28 18:46:20 +05:30
3a943d6f09
Add ServerId method, code style
2020-11-27 13:29:05 -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
a6245d9e90
Minor code style update
2020-11-27 13:27:51 -05:00
d6345d32fd
Reduce error level of warnings about monitors having Function==NONE
2020-11-25 09:53:06 -05:00
e0a30ab5e0
Only log an error if we haven't been given sigpipe.
2020-11-22 17:28:53 -05:00
660636c0e2
loop if we get egain when flocking. Warn when format not specified.
2020-11-22 16:54:42 -05:00
4d8f45d284
There is no need to copy query. We do not modify it.
2020-11-21 16:59:21 -05:00
1b472edc2b
fix cast
2020-11-21 16:58:22 -05:00
6da673dd69
remove unused includes
2020-11-21 09:25:36 -05:00
5f4fb4200f
googe code style
2020-11-21 09:25:10 -05:00
2cdf0da3c0
Remove unused includes and apply google code style
2020-11-21 09:15:36 -05:00
7653a058a3
More correct code for setting source
2020-11-20 16:31:40 -05:00
e1a0c4f973
Don't log a warning of comms not open if no connkey
2020-11-20 16:31:12 -05:00
65d4c43cc2
Use BOUNDARY instead of ZoneMinderFrame. If we get EAGAIN when flocking, try again.
2020-11-20 16:29:10 -05:00
4f178e47bc
Break early after setting zm_terminate so that zms quits faster. Use a basic assignment instead of memcpy for last_frame_timestamp
2020-11-19 16:39:53 -05:00
03f033cf36
cleanup MOnitor destructor. Most of the freeing is done in disconnect now. Fixes zms crash
2020-11-19 16:39:14 -05:00
3f1e7e793f
update buffertype after DumpBUffer
2020-11-19 16:38:49 -05:00
58ccea6aa8
use better c++ class initialisation. Use ZM_BUFTYPE_DONTFREE instead of 0 for init buffertype.
2020-11-19 16:37:28 -05:00
634a3dbe81
fix crashes/memleaks when waiting for a zmc process to start. Fix other memleaks
2020-11-19 10:43:02 -05:00
ae4e2a1d5e
We were overwriting the privacy/inactive zone with a more general one. Slight memleak
2020-11-19 10:42:17 -05:00
74972be9b5
spacing, code style. Set row=nullptr to quiet valgrind
2020-11-18 13:15:52 -05:00
d4253be69f
Use proper C++ initializer for Config. Don't copy the sql string, just use it from whereever in ram it is.
2020-11-18 13:15:07 -05:00
6542072334
fix logic causing segfault instead of waiting for zmc. Remove trailing whitespaces
2020-11-18 09:56:13 -05:00
9713a2ec00
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-17 11:09:31 -05:00
d5295a4464
Fix segfaults and valgrind complaints. Initialize vncClientData, handle failure to connect freeing our client.
2020-11-17 11:08:11 -05:00
d2a203014f
rename diagpipe-r so that we don't have to create directories in SOCKS_DIR
2020-11-13 17:05:03 -05:00
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
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
15f1175f25
spacing
2020-11-12 12:36:36 -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
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
56bbd91a02
Merge branch 'zma_to_thread' of github.com:Connortechnology/zoneminder into zma_to_thread
2020-10-20 16:05:35 -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
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
e163a3c93a
spacing more debug
2020-09-25 16:20:19 -04:00
f18cd57221
spacing more debug
2020-09-25 16:19:52 -04:00
d21c04e5dc
add Debug
2020-09-25 16:19:31 -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
c0ab8bf90d
Merge branch 'master' into zma_to_thread
2020-08-07 17:53:32 -04:00
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -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
cf07e0a089
fix crashes, current status is: local camera works and can be viewed. Amazing
2020-07-22 13:41:27 -04:00
3641797500
Merge branch 'master' into zma_to_thread
2020-07-22 13:14:40 -04:00
7e6c637ec3
Unexpected colours while bad should only cause failure to annotate, not panic
2020-07-22 11:34:54 -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
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
1f6e68c129
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-05-08 17:26:02 -04:00
a798e874fe
Spacing
2020-05-07 13:44:32 -04:00
fcf6eb2631
Add setting the codecpar->codec_type as well. Fixes detecting stream type
2020-05-07 13:44:02 -04:00
40633830d0
Code style/spacing
2020-05-07 13:43:35 -04:00
b1b258ab9b
Code Style and use backtick escapes on sql column names, specifically Function
2020-05-07 13:43:05 -04:00
6939f9953a
code style, merge Debug lines and consult zm_terminate in the main while loop
2020-05-07 13:41:39 -04:00
87d0eb88b7
code style, merge Debug lines and consult zm_terminate in the main while loop
2020-05-07 13:41:29 -04:00
09740d72a4
code style, merge Debug lines and consult zm_terminate in the main while loop
2020-05-07 13:41:09 -04:00
7489d66557
use is_video_stream utility function.
2020-05-07 13:40:32 -04:00
9f73a55087
Make params to is_video_* a const because we don
...
't alter it
2020-05-07 13:39:32 -04:00
bab15217f5
Make zm_terminate available to anyone who includes zm.h
2020-05-07 13:38:56 -04:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
e9b1eacc6d
Fix not finding stream with old libs
2020-05-02 11:49:28 -04:00
eca56c7123
Provide a more useful error message when the monitor's function is set to NONE. Fixes #2877
2020-05-01 19:21:20 -04:00
ef540aa972
sun_path is defined to be 108 bytes. No need for 4095. Quiets compiler warnings
2020-05-01 19:13:50 -04:00
c9f04c9136
Support event_close_mode for record mode
...
Support event_close_mode for record mode (with linked monitor)
2020-05-01 19:10:23 -04:00
6098c4c961
properly close streams and free memory in ffmpeg_input destructor
2020-05-01 19:03:18 -04:00
c5cf6e1a74
undo random addition
2020-05-01 19:01:09 -04:00
050868fad1
fix build on libavtools < 12
2020-05-01 19:00:40 -04:00
9beb5cee3a
use delete[] instead of delete.
2020-05-01 18:55:48 -04:00
24aaeee155
dynamically load monitor Object when loading event data. Also dynamically load Storage, but only when the Id is different. Free the various objects in the destructor. Sync up some spacing issues with master.
2020-05-01 18:44:35 -04:00
2071b2a71e
Guess video file name for in progress events
2020-05-01 18:14:58 -04:00
917c43a54b
If can't connect to db, bail instead of loading config
2020-05-01 18:08:32 -04:00
f96cc66b9d
google code style
2020-05-01 18:06:27 -04:00
ffcef8a42a
spacing and make sws_context static global so we don't have to keep initializing it when playing back from mp4 in eventstream.
2020-05-01 15:22:32 -04:00
ffd7970b07
Merge branch 'release-1.34'
2020-05-01 13:17:10 -04:00
14b90903a9
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-05-01 12:50:10 -04:00
3675ee1c33
Properly delete FramesData as well.
2020-05-01 09:56:27 -04:00
434f34f027
use delete[] instead of delete.
2020-04-30 11:04:55 -04:00
a6ee817bc4
Fix auth by hash
2020-04-28 19:00:42 -04:00
e21ffbea7d
Merge branch 'fix_zms'
2020-04-26 18:43:39 -04:00
ae9a5766f5
Merge branch 'release-1.34' into fix_zms
2020-04-26 18:19:30 -04:00
3b11258fbc
Make checkEventLoaded return true if a new event was loaded, false otherwise. The idea is to give more information back to whoever calls it
2020-04-26 15:22:29 -04:00
Isaac Connor
hax0kartik
Bluemax
Isaac Connor
Isaac Connor
Isaac Connor
Peter Keresztes Schmidt
Andrew Bauer
dmo
Joe540