Isaac Connor
|
7a85be59be
|
Remove errant closing db debug output
|
2020-05-15 10:22:58 -04:00 |
Isaac Connor
|
d92772343a
|
Merge branch 'release-1.34'
|
2020-05-14 12:02:50 -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 |
|
Isaac Connor
|
402c0c6a1b
|
Fix build on older ffmpeg
|
2020-05-14 12:01:03 -04:00 |
|
Isaac Connor
|
efbab4e2bc
|
Dont' call mysql_library_end as it segfaults and hangs.
|
2020-05-14 12:00:36 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
81cd338545
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2020-05-11 08:34:19 -04:00 |
|
Isaac Connor
|
3d278eddf8
|
erge branch 'master' into batch_frame_records
|
2020-05-08 20:16:36 -04:00 |
|
Isaac Connor
|
1f6e68c129
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-05-08 17:26:02 -04:00 |
|
Isaac Connor
|
a798e874fe
|
Spacing
|
2020-05-07 13:44:32 -04:00 |
|
Isaac Connor
|
fcf6eb2631
|
Add setting the codecpar->codec_type as well. Fixes detecting stream type
|
2020-05-07 13:44:02 -04:00 |
|
Isaac Connor
|
40633830d0
|
Code style/spacing
|
2020-05-07 13:43:35 -04:00 |
|
Isaac Connor
|
b1b258ab9b
|
Code Style and use backtick escapes on sql column names, specifically Function
|
2020-05-07 13:43:05 -04:00 |
|
Isaac Connor
|
6939f9953a
|
code style, merge Debug lines and consult zm_terminate in the main while loop
|
2020-05-07 13:41:39 -04:00 |
|
Isaac Connor
|
87d0eb88b7
|
code style, merge Debug lines and consult zm_terminate in the main while loop
|
2020-05-07 13:41:29 -04:00 |
|
Isaac Connor
|
09740d72a4
|
code style, merge Debug lines and consult zm_terminate in the main while loop
|
2020-05-07 13:41:09 -04:00 |
|
Isaac Connor
|
7489d66557
|
use is_video_stream utility function.
|
2020-05-07 13:40:32 -04:00 |
|
Isaac Connor
|
9f73a55087
|
Make params to is_video_* a const because we don
't alter it
|
2020-05-07 13:39:32 -04:00 |
|
Isaac Connor
|
bab15217f5
|
Make zm_terminate available to anyone who includes zm.h
|
2020-05-07 13:38:56 -04:00 |
|
Isaac Connor
|
e9b1eacc6d
|
Fix not finding stream with old libs
|
2020-05-02 11:49:28 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
ef540aa972
|
sun_path is defined to be 108 bytes. No need for 4095. Quiets compiler warnings
|
2020-05-01 19:13:50 -04:00 |
Joe540
|
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 |
|
Isaac Connor
|
6098c4c961
|
properly close streams and free memory in ffmpeg_input destructor
|
2020-05-01 19:03:18 -04:00 |
|
Isaac Connor
|
c5cf6e1a74
|
undo random addition
|
2020-05-01 19:01:09 -04:00 |
|
Isaac Connor
|
050868fad1
|
fix build on libavtools < 12
|
2020-05-01 19:00:40 -04:00 |
|
Isaac Connor
|
9beb5cee3a
|
use delete[] instead of delete.
|
2020-05-01 18:55:48 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
2071b2a71e
|
Guess video file name for in progress events
|
2020-05-01 18:14:58 -04:00 |
|
Isaac Connor
|
917c43a54b
|
If can't connect to db, bail instead of loading config
|
2020-05-01 18:08:32 -04:00 |
|
Isaac Connor
|
f96cc66b9d
|
google code style
|
2020-05-01 18:06:27 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
ffd7970b07
|
Merge branch 'release-1.34'
|
2020-05-01 13:17:10 -04:00 |
|
Isaac Connor
|
14b90903a9
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-05-01 12:50:10 -04:00 |
|
Isaac Connor
|
3675ee1c33
|
Properly delete FramesData as well.
|
2020-05-01 09:56:27 -04:00 |
|
Isaac Connor
|
434f34f027
|
use delete[] instead of delete.
|
2020-04-30 11:04:55 -04:00 |
|
Isaac Connor
|
a6ee817bc4
|
Fix auth by hash
|
2020-04-28 19:00:42 -04:00 |
|
Isaac Connor
|
e21ffbea7d
|
Merge branch 'fix_zms'
|
2020-04-26 18:43:39 -04:00 |
|
Isaac Connor
|
ae9a5766f5
|
Merge branch 'release-1.34' into fix_zms
|
2020-04-26 18:19:30 -04:00 |
|
Isaac Connor
|
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
|
a7363a4b36
|
reduce compiler deprecation warnings by using our zm api's that hide support for older ffmpeg versions
|
2020-04-24 19:05:58 -04:00 |
|
Isaac Connor
|
7a7f366eb1
|
Change semantics of zm_send_packetreceive_frame to return the # of bytes consumed. This is inline with how to old deprecated api used to work. The new api consumes the packet, so just return packet size.
|
2020-04-24 19:05:17 -04:00 |
|
Isaac Connor
|
c6c8a23c02
|
sun_path is defined to be 108 bytes. No need for 4095. Quiets compiler warnings
|
2020-04-24 18:03:00 -04:00 |
|
Isaac Connor
|
b0c5abc2c2
|
Quiet compiler warnings.
|
2020-04-24 17:51:00 -04:00 |
|
Isaac Connor
|
ed7c0815de
|
Merge branch 'release-1.34'
|
2020-04-24 17:05:32 -04:00 |
|
Isaac Connor
|
3dd5ac8146
|
shrink buffers for writing timestamp into. Don't need 64 when 28 will do. Quiets compiler warnings
|
2020-04-24 16:43:27 -04:00 |
|
Isaac Connor
|
e274aa471a
|
Use fputc instead of printf for separator to be a tiny bit more efficient. Report current state when forcing alarm on
|
2020-04-23 18:13:34 -04:00 |
|
Isaac Connor
|
00dad82b46
|
Fix use of strncpy using the entire size of the buffer. You have to -1 for the null char
|
2020-04-23 18:12:54 -04:00 |
|
Isaac Connor
|
4aaa02dc24
|
fix cpplint complaints and remove casts that are unnecessary. Micro-optimisation by using fputs for date_string instead of fprintf
|
2020-04-23 18:12:44 -04:00 |
Pliable Pixels
|
df4fab5fbf
|
re-enable fragmented mp4 recordings
|
2020-04-23 18:11:10 -04:00 |
|
Isaac Connor
|
b8781301f8
|
Drop lock around openFile so that we don't hang
|
2020-04-23 18:08:14 -04:00 |
|
Isaac Connor
|
d31216330c
|
Only align buffers to 32bit if using a 32bit pix format. Fixes #2819
|
2020-04-23 18:07:07 -04:00 |
|
Isaac Connor
|
5bf068791b
|
Merge branch 'rate_dropdown' into release-1.34
|
2020-04-23 16:11:59 -04:00 |
|
Pliable Pixels
|
9b77f77ac3
|
better logs
|
2020-04-23 11:09:39 -04:00 |
|
Isaac Connor
|
098ab4faae
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-04-23 10:26:25 -04:00 |
|
Isaac Connor
|
4b53c7660e
|
Merge pull request #2911 from hax0kartik/dl-curl
Dynamically load libcurl, libvlc and libvnc
|
2020-04-22 09:49:37 -04:00 |
|
Isaac Connor
|
76d88621ac
|
clean up Stream and EventStream Object initializers
|
2020-04-21 08:28:44 -04:00 |
|
Isaac Connor
|
924841ae71
|
Merge pull request #2913 from connortechnology/fix_monitor_loading
Fix monitor loading
|
2020-04-18 17:49:34 -04:00 |
|
Isaac Connor
|
d0c36c9888
|
Merge pull request #2913 from connortechnology/fix_monitor_loading
Fix monitor loading
|
2020-04-17 10:26:03 -04:00 |
|
Isaac Connor
|
b504110825
|
Correct loading monitor values from db
|
2020-04-16 17:54:20 -04:00 |
|
Isaac Connor
|
f60f91c834
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-04-14 17:01:58 -04:00 |
|
Isaac Connor
|
c50509d22a
|
Fix use of strncpy using the entire size of the buffer. You have to -1 for the null char
|
2020-04-14 17:01:50 -04:00 |
|
Isaac Connor
|
17356a7b3a
|
Use a BOUNDARY define to construct boundary strings. Get rid of code that kills zms when the frame rate drops too low, as dying doesn't help, and some cameras just have a really low frame rate.
|
2020-04-14 17:01:12 -04:00 |
|
Isaac Connor
|
9193ef4a62
|
Send the first frame twice to fix low framerate display in Chrome
|
2020-04-14 16:44:03 -04:00 |
hax0kartik
|
640dfdd4a0
|
Dynamically load libvnc at runtime
|
2020-04-14 02:46:01 +05:30 |
|
hax0kartik
|
143ad394a9
|
Dynamically load libvlc
|
2020-04-14 00:15:06 +05:30 |
|
hax0kartik
|
f4c4441308
|
Convert all fatals in lincurl camera to errors
|
2020-04-13 18:55:29 +05:30 |
|
Joe540
|
657a353c34
|
Support event_close_mode for record mode
Support event_close_mode for record mode (with linked monitor)
|
2020-04-12 20:42:43 -04:00 |
|
hax0kartik
|
3a8b931cda
|
Fix stuff
|
2020-04-08 12:52:09 -04:00 |
|
hax0kartik
|
64f57aa373
|
Dynamically load libcurl at runtime
|
2020-04-08 05:18:16 -04:00 |
|
Isaac Connor
|
8193e4ea4e
|
replace snprintf with hex table lookup for speed
|
2020-04-06 11:46:14 -04:00 |
|
Isaac Connor
|
1e38ba871d
|
Merge branch 'master' into fix_use_of_sprintf
|
2020-04-06 11:23:12 -04:00 |
|
Isaac Connor
|
c6e0b9be39
|
Merge branch 'master' into fix_use_of_sprintf
|
2020-04-06 11:21:43 -04:00 |
|
Isaac Connor
|
98e9355723
|
snprintf will put the terminator in. We don't have to.
|
2020-04-06 11:21:02 -04:00 |
|
hax0kartik
|
face73ad7e
|
Fix compilation
|
2020-04-05 22:45:47 -04:00 |
|
Isaac Connor
|
2827ba38cd
|
use snprintf instead of sprintf. Fix putting a \0 terminator
|
2020-04-05 13:41:03 -04:00 |
|
Isaac Connor
|
9441fe833f
|
satisfy cpplint
|
2020-04-05 13:23:12 -04:00 |
|
hax0kartik
|
04a6d5e42e
|
Fix a memory leak, shift rfbClientCleanup to Terminate()
|
2020-03-30 10:11:42 -07:00 |
|
hax0kartik
|
6886b2b375
|
Modify Convert to scale as well
|
2020-03-28 15:17:19 -07:00 |
|
Isaac Connor
|
b93f5d970c
|
sws_scale directly into the image. Allocate and de-allocate sws in Prime and Close. Seems to fix scaling.
|
2020-03-28 16:03:52 -04:00 |
|
Isaac Connor
|
e894102cb7
|
debug
|
2020-03-28 11:59:05 -04:00 |
|
hax0kartik
|
a781cc2c87
|
WIP scaling
|
2020-03-27 14:32:50 -04:00 |
|
hax0kartik
|
b615eada41
|
Add a missing endif
|
2020-03-27 14:32:50 -04:00 |
|
hax0kartik
|
d61e5e42ca
|
Use preprocessors to ensure libvnc monitor is only built when libvnc is found
|
2020-03-27 14:32:50 -04:00 |
|
hax0kartik
|
ae80b3b859
|
Start implementing VNC
|
2020-03-27 14:32:50 -04:00 |
|
Isaac Connor
|
bc950c9a34
|
Remove <set> and <map> as they are not used
|
2020-03-26 15:11:39 -04:00 |
|
Isaac Connor
|
79ad2ec87d
|
better debug logging for SLOWFWD and SLOWREV listing new frame_id
|
2020-03-26 15:08:32 -04:00 |
|
Isaac Connor
|
e98f422730
|
Use %d for values that are actually integer in debug statements
|
2020-03-26 15:04:28 -04:00 |
|
Isaac Connor
|
45299955a1
|
Fix SLOW FWD not working
|
2020-03-26 12:21:42 -04:00 |
|
Isaac Connor
|
ea7bea4c6e
|
fix warnings because length() returns long unsigned int, but gnutls_datum_t size is unsigned int.
|
2020-03-26 12:08:21 -04:00 |
|
Isaac Connor
|
a5ec89ab1b
|
use bool instead of my_bool to fix #2886
|
2020-03-26 12:07:58 -04:00 |
|
Isaac Connor
|
cbda9848ab
|
Fix SLOW FWD not working
|
2020-03-26 12:06:07 -04:00 |
|
Isaac Connor
|
adf953dcdd
|
use bool instead of my_bool to fix #2886
|
2020-03-24 15:30:52 -04:00 |
|
Isaac Connor
|
0ecd35e1c6
|
fix warnings because length() returns long unsigned int, but gnutls_datum_t size is unsigned int.
|
2020-03-24 15:30:16 -04:00 |
|
Isaac Connor
|
7fcd71e684
|
Use fputc instead of printf for separator to be a tiny bit more efficient. Report current state when forcing alarm on
|
2020-03-24 15:19:16 -04:00 |
|
Isaac Connor
|
4aaaeda6ed
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-03-16 21:06:39 -04:00 |
|
Isaac Connor
|
ad61a0e385
|
Escape Function to fix mysql8. Fixes #2885
|
2020-03-16 21:06:31 -04:00 |
|
Pliable Pixels
|
30d45aee8f
|
formatting/comment
|
2020-03-13 15:11:00 -04:00 |
|
Pliable Pixels
|
dd76ee2c9f
|
spacing
|
2020-03-13 15:01:19 -04:00 |
|
Pliable Pixels
|
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 |
|
Pliable Pixels
|
ff7defa84e
|
re-enable fragmented mp4 recordings
|
2020-03-13 14:46:20 -04:00 |
|
Isaac Connor
|
11b1bf1100
|
undo random addition
|
2020-03-11 10:54:52 -04:00 |
|
Isaac Connor
|
c90655d178
|
fix build on libavtools < 12
|
2020-03-11 10:54:35 -04:00 |
|
Isaac Connor
|
9a3127da06
|
Merge branch 'rate_dropdown'
|
2020-03-10 18:47:19 -04:00 |
|
Isaac Connor
|
84d719f2dd
|
Merge branch 'release-1.34' into rate_dropdown
|
2020-03-10 16:06:11 -04:00 |
|
Isaac Connor
|
d055d40bfb
|
Merge branch 'release-1.34'
|
2020-03-09 13:15:16 -04:00 |
|
Isaac Connor
|
ffed88454f
|
Provide a more useful error message when the monitor's function is set to NONE. Fixes #2877
|
2020-03-09 13:14:09 -04:00 |
|
Isaac Connor
|
3a129a8818
|
Merge pull request #2874 from hax0kartik/2810-libjwt
Add libjwt and remove gnutls-openssl wrapper
|
2020-03-06 14:48:45 -05:00 |
|
Isaac Connor
|
835966eb24
|
Merge pull request #2874 from hax0kartik/2810-libjwt
Add libjwt and remove gnutls-openssl wrapper
|
2020-03-05 15:30:27 -05:00 |
|
hax0kartik
|
a53f67cd31
|
Remove a extra file added by mistake
|
2020-03-05 09:53:07 -08:00 |
|
hax0kartik
|
15aec7b109
|
Add libjwt
|
2020-03-05 09:51:33 -08:00 |
|
hax0kartik
|
2091ad8c92
|
Add libjwt and remove gnutls-openssl wrapper
|
2020-03-05 09:29:27 -08:00 |
|
Isaac Connor
|
b78acd7b95
|
google code style
|
2020-03-04 14:14:38 -05:00 |
|
Isaac Connor
|
6d4ed20745
|
Drop lock around openFile so that we don't hang
|
2020-03-04 14:14:28 -05:00 |
|
Isaac Connor
|
2882693791
|
If can't connect to db, bail instead of loading config
|
2020-03-04 14:13:44 -05:00 |
|
Isaac Connor
|
444c6fd372
|
Revert "Add libjwt as a optional library"
|
2020-03-04 13:57:27 -05:00 |
|
Isaac Connor
|
5443e6385b
|
Merge pull request #2844 from hax0kartik/2810-libjwt
Add libjwt as a optional library
|
2020-03-04 11:58:27 -05:00 |
|
Isaac Connor
|
4c7178b78b
|
fix cpplint complaints and remove casts that are unnecessary. Micro-optimisation by using fputs for date_string instead of fprintf
|
2020-03-04 11:02:21 -05:00 |
|
Pliable Pixels
|
54c14db863
|
better logs
|
2020-03-01 14:02:44 -05:00 |
|
hax0kartik
|
182120343f
|
Fix an issue while finding libjwt-gnutls and add a missing include
|
2020-03-01 06:17:43 -08:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
20d1cc99f4
|
Merge branch 'fix_zmu_using_token_auth'
|
2020-02-25 14:41:01 -05:00 |
|
Isaac Connor
|
f05dbd3b89
|
Fix zmu not respecting jwt token auth when AUTH_RELAY set to none
|
2020-02-25 14:40:47 -05:00 |
|
Isaac Connor
|
4798fba807
|
Merge branch 'use_concat_when_updating_event_notes'
|
2020-02-25 14:16:46 -05:00 |
|
Isaac Connor
|
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
|
5ed6d36afe
|
Merge branch 'release-1.34'
|
2020-02-24 14:12:21 -05:00 |
|
Isaac Connor
|
f4521d20e0
|
Fix applying rotation to x264encoded video which has already been rotated.
|
2020-02-24 14:12:10 -05:00 |
|
Isaac Connor
|
c1dfb8571a
|
revert bogus code in Image(AvFrame)
|
2020-02-24 14:10:54 -05:00 |
|
Isaac Connor
|
d2872becfc
|
Only align buffers to 32bit if using a 32bit pix format. Fixes #2819
|
2020-02-23 18:14:17 -05:00 |
|
hax0kartik
|
b1ce0ec0e8
|
Fix cmake
|
2020-02-23 06:18:32 -08:00 |
|
Isaac Connor
|
d51fdafbc0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-02-21 09:37:45 -05:00 |
|
Isaac Connor
|
b4729f5aa8
|
Handle other colours and subpixel formats in Image::Image(AvFrame*) than 32bit RGBA
|
2020-02-21 09:34:44 -05:00 |
|
hax0kartik
|
46d77ee849
|
Add libjwt as a optional library
|
2020-02-20 07:55:59 -08:00 |
|
hax0kartik
|
1959b2e070
|
Add optional library jwt
|
2020-02-20 07:45:33 -08:00 |
|
Isaac Connor
|
c488756eb8
|
Merge branch 'master' into fix_remote_http
|
2020-02-19 14:42:24 -05:00 |
|
Isaac Connor
|
4f25426b1f
|
load event orientation as well and if it's an mp4 do the rotation on the image before outputting. Fixes #2829
|
2020-02-10 16:22:01 -05:00 |
|
Isaac Connor
|
d0003215b1
|
Merge branch 'master' into rate_dropdown
|
2020-01-17 12:30:35 -05:00 |
|
Isaac Connor
|
9525268192
|
Wait 5 seconds instead of 1 after failure to connect. Reduces error logs filling up db.
|
2020-01-13 12:52:34 -05:00 |
|
Isaac Connor
|
0afcbe626c
|
remove redundant logging line. Connect() will do the logging
|
2020-01-13 12:51:30 -05:00 |
|
Isaac Connor
|
6da998b0c0
|
code comments and parenthesis
|
2020-01-10 16:42:18 -05:00 |
|
Isaac Connor
|
1bdabefb2d
|
fix single stepping in reverse but actually modifying curr_frame_id
|
2020-01-07 17:07:35 -05:00 |
|
Isaac Connor
|
1c197db619
|
Merge branch 'master' into rate_dropdown
|
2020-01-07 14:49:58 -05:00 |
|
Isaac Connor
|
b85cf7d8a1
|
include error message when complaining about failing to create the hwaccell device
|
2020-01-07 11:03:45 -05:00 |
Isaac Connor
|
fd633a2175
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2020-01-05 17:28:50 -05:00 |
|
Isaac Connor
|
05ac82b0bb
|
Handle failure to init hwdevice when trying to use hwaccel.
|
2020-01-05 17:27:45 -05:00 |
|
Isaac Connor
|
e039b136c0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-12-29 16:46:45 -05:00 |
|
Isaac Connor
|
f065daf940
|
spacing, move some variables deeper in scope, merge fprintf calls
|
2019-12-29 16:46:30 -05:00 |
|
Isaac Connor
|
b5e3dbd415
|
put back 32bit alignment with a comment as to why
|
2019-12-29 12:52:34 -05:00 |