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
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
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
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
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
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
924841ae71
Merge pull request #2913 from connortechnology/fix_monitor_loading
...
Fix monitor loading
2020-04-18 17:49:34 -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
84d719f2dd
Merge branch 'release-1.34' into rate_dropdown
2020-03-10 16:06:11 -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
f05dbd3b89
Fix zmu not respecting jwt token auth when AUTH_RELAY set to none
2020-02-25 14:40:47 -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
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
Isaac Connor
2581b86195
add more content to the error message when can't sws_scale.
...
Also fix problem when using 32bit on arm instead of 24bit, apparently 0 is a valid return result from sws_scale.
Also change the alignment in av_image_fill_arrays. At some point we cahnged it to 32bit aligned, but in 1.32 we didn't align at all. Not sure if it matters
.
2019-12-29 12:44:59 -05:00
Isaac Connor
bbcd1846e7
Fix hang caused by using %d instead of PRIu64 in formatting string
2019-12-29 12:44:30 -05:00
Isaac Connor