Isaac Connor
e5dda8d142
Include avutils/imgutils.h to support compile on libav-tools
2020-08-16 14:56:52 -04:00
Andrew Bauer
09b12a7dac
Remove extra space in event name
2020-08-13 10:51:10 -05:00
Isaac Connor
d42424d6d8
Merge branch 'release-1.34'
2020-08-11 11:41:11 -04:00
Isaac Connor
afae319c94
Fix MOCORD not going into ALARM state.
2020-08-11 11:02:26 -04:00
Isaac Connor
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
Andrew Bauer
98f315951e
Merge pull request #3003 from marillat/patch-1
...
Don't prefix manpage with zoneminder-
2020-08-07 12:34:30 -07:00
dmo
ed496e74fc
Update CMakeLists.txt
2020-08-07 07:54:58 +02:00
Isaac Connor
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
Isaac Connor
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
Isaac Connor
4d4fab46d6
Spacing, use FFMpegInit instead of deprecated ffmpeg calls
2020-08-05 19:17:00 -04:00
Isaac Connor
b867d0c463
Fix image copy when line sizes are not the same.
2020-08-05 11:33:22 -04:00
Isaac Connor
be05040a47
fix rotated images
2020-07-30 19:50:25 -04:00
Isaac Connor
05107bb2f7
Add debug of unused options
2020-07-30 15:16:31 -04:00
Isaac Connor
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
Isaac Connor
2f57ccc9b9
Merge branch 'release-1.34'
2020-07-29 16:27:01 -04:00
Isaac Connor
4ed0ad26a7
bail early if fwrite fails
2020-07-29 14:01:52 -04:00
Isaac Connor
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
Isaac Connor
7511b1fd7e
Fix for saving jpegs
2020-07-25 14:25:45 -04:00
Isaac Connor
859428db51
remove debug
2020-07-24 15:42:53 -04:00
Isaac Connor
f4a0f91d7f
nothing
2020-07-24 15:27:05 -04:00
Isaac Connor
1f889bd086
def don't use linesize when allocating share images
2020-07-24 15:26:48 -04:00
Isaac Connor
4ecfa32601
remove uneccessary multiplications from jpeg compression.
2020-07-24 15:26:28 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
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
Isaac Connor
490009446d
fix use of int or unsigned long instead of int for monitor id
2020-07-23 19:32:30 -04:00
Isaac Connor
559fe15e3f
fix use of int or unsigned long instead of int for monitor id
2020-07-23 19:32:25 -04:00
Isaac Connor
e9681fcdcf
fix use of int or unsigned long instead of int for monitor id
2020-07-23 19:31:12 -04:00
Isaac Connor
ee4d90d906
remove debug
2020-07-23 17:15:43 -04:00
Isaac Connor
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
Isaac Connor
4f3b6a063e
don't cast fps to an int... values like 2.038 become 1.
2020-07-23 16:08:57 -04:00
Isaac Connor
e3a2099ca8
fix crash because we weren't setting alarm status
2020-07-23 16:08:35 -04:00
Isaac Connor
18272b9587
add debug for prealarmcount
2020-07-23 12:05:53 -04:00
Isaac Connor
7aa46df50f
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-07-23 12:05:32 -04:00
Isaac Connor
09d02e94d9
fix lack of c_str on path
2020-07-23 11:53:54 -04:00
Isaac Connor
27fed8b227
spacing
2020-07-23 11:53:33 -04:00
Isaac Connor
172eaad8bd
fix capture jpeg saving due to use of std::string
2020-07-22 22:45:11 -04:00
Isaac Connor
1416bc547e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-22 17:37:52 -04:00
Isaac Connor
f635afe00f
spacing
2020-07-22 17:30:39 -04:00
Isaac Connor
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
Isaac Connor
7e6c637ec3
Unexpected colours while bad should only cause failure to annotate, not panic
2020-07-22 11:34:54 -04:00
Isaac Connor
13e8ed1924
Clean up code that updates event with video_name. Fix video_file assignment missing /
2020-07-21 16:34:46 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
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
Isaac Connor
785087022d
Clear PerAlarmFrames on shutdown
2020-07-20 21:09:07 -04:00
Isaac Connor
a0be7b1fcb
fixup EmptyPreAlarmFrames
2020-07-20 21:02:49 -04:00
Isaac Connor
41dfb8ae38
fix duplicate jpeg_create_compress memleak
2020-07-20 21:02:06 -04:00
Isaac Connor
d716d1d686
Merge branch 'release-1.34'
2020-07-20 16:25:41 -04:00
Isaac Connor
5c844f9cae
remove extra space
2020-07-20 10:22:40 -04:00
Isaac Connor
01892352da
rename sseversion to sse_version
2020-07-19 17:50:47 -04:00
Isaac Connor
6b39f59b3a
use delete[] instead of delete.
2020-07-16 16:00:23 -04:00
Isaac Connor
2c056c188f
Fix compile on old ffmpeg
2020-07-16 15:59:08 -04:00
Isaac Connor
4e2732e12d
Priming capture logs should be debug not Info
2020-07-16 15:51:24 -04:00
Isaac Connor
a7b76dfe41
Remove debug
2020-07-16 15:48:09 -04:00
Isaac Connor
0a6321ee56
Update linesize when using AssignDirect. Fixes #2979
2020-07-16 15:48:06 -04:00
Isaac Connor
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
Isaac Connor
a8e46feb12
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-16 15:42:56 -04:00
Isaac Connor
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
Isaac Connor
c2a025300f
Remove debug
2020-07-16 15:34:29 -04:00
Isaac Connor
9e06385f26
Update linesize when using AssignDirect. Fixes #2979
2020-07-16 14:50:50 -04:00
Isaac Connor
9b05337e57
Priming capture logs should be debug level, especially if they ar egoing to log passwords
2020-07-13 15:03:04 -04:00
Isaac Connor
880219bb0f
Merge branch 'release-1.34'
2020-07-07 18:58:32 -04:00
Isaac Connor
9b447bde8e
remove extra {
2020-07-07 18:56:51 -04:00
Isaac Connor
e675c8373e
Merge branch 'release-1.34'
2020-07-07 16:15:56 -04:00
Isaac Connor
916d1ed59e
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-07-07 16:15:23 -04:00
Isaac Connor
c79c65e72e
spacing fixes
2020-07-07 16:14:57 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
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
Isaac Connor
209cbe1000
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-07 09:23:46 -04:00
Isaac Connor
acf8a30434
Merge branch 'release-1.34'
2020-07-07 09:22:56 -04:00
Isaac Connor
533876f313
rewrite code to use fewer lines. No logic change.
2020-07-07 09:16:42 -04:00
Andrew Bauer
dcab218a2e
remove global config item CREATE_ANALYSIS_IMAGES
2020-07-06 12:22:41 -05:00
Isaac Connor
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
Isaac Connor
2eac69dd88
fix duplicate extrapad names
2020-07-04 17:16:43 -04:00
Isaac Connor
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
Isaac Connor
e137e1dacf
Don't consult EVENT_CLOSE_MODE if mode is RECORD
2020-06-26 19:30:35 -04:00
Isaac Connor
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
Isaac Connor
31a3be5c8e
check shared_data->valid when checking if LinkedMonitor is connected
2020-06-23 15:05:17 -04:00
Isaac Connor
7354b4d30f
Fix compile on old ffmpeg
2020-06-23 14:43:11 -04:00
Isaac Connor
a15aace2fb
introduce shared_data->zmc_heartbeat_time and zma_heartbeat_time.
2020-06-22 10:40:00 -04:00
Isaac Connor
4d020bab56
spacing
2020-06-22 10:39:29 -04:00
Isaac Connor
ae5116ff9c
improve efficiency of outputting device query. The constant strlen's were terrible.
2020-06-15 15:29:26 -04:00
Isaac Connor
bd287d7c7c
Fix segfault when timestamp contains an unimplemented character. Fixes #2943
2020-05-29 11:45:38 -04:00
Isaac Connor
2637c887f8
Fix segfault when timestamp contains an unimplemented character. Fixes #2943
2020-05-29 11:44:34 -04:00
Isaac Connor
662b9894bd
Don't delete send_image because it is static. Fixes #2923
2020-05-23 16:12:55 -04:00
Isaac Connor
ce9e2c8b27
Merge branch 'release-1.34'
2020-05-15 11:53:09 -04:00
Isaac Connor
9ea1c637f9
Remove debug Exiting message
2020-05-15 11:48:41 -04:00
Isaac Connor
6bb2c09a72
Merge branch 'release-1.34'
2020-05-15 11:41:34 -04:00
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
37c829f2bf
cleanup code a bit. Move BlobStats to the Zone Object so that it isn't constantly being allocated/freed from the heap. Improve ParsePolygon.
2020-04-20 11:19:33 -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