Commit Graph

3206 Commits

Author SHA1 Message Date
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
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
Andrew Bauer 00cedc92d2 fix typo 2019-12-28 08:37:16 -06:00
Isaac Connor 16a73d6d5a don't seek back when not neccesary 2019-12-13 18:12:33 -05:00
Isaac Connor 5fcd6361bc fix segfault reading frames for .mp4 in zms 2019-12-13 17:47:18 -05:00
Isaac Connor 9972a2fd0c wip work on fixing zms mp4 to mjpeg 2019-12-02 15:51:08 -05:00
Isaac Connor 3b9b49c44d wip work on fixing zms mp4 to mjpeg 2019-12-02 15:51:03 -05:00
Isaac Connor 0947c3ef24 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-11-30 15:37:09 -05:00
Isaac Connor 927165a934 debug the recording_started timestamp and warning when we can't fine a frame before the requested time 2019-11-30 15:37:05 -05:00
Isaac Connor 00b67ec352
Merge pull request #2768 from selvanair/fix-video-start
Correct video buffer length when analysis and capture fps differ
2019-11-30 14:53:22 -05:00
Isaac Connor d1458108f4 Add dimensions wrong check. Add bytes count 2019-11-20 12:43:17 -05:00
Selva Nair 5260563ec4 Update frame deltas in the database to be relative to the video start time
Currenltly the frames written to database have delta time measured
from the event start time. As these deltas are also used to generate
any frame on the fly from the recorded video, these should be relative
to the video start time.

Adjust by subtracting the offset of the video start from event start.
Done when the event is closed.

If video is not stored, this has no effect.

Signed-off-by: Selva Nair <selva.nair@gmail.com>
2019-11-15 21:55:40 -05:00
Selva Nair dd31279ca3 Fix the recorded video start time
The event start time already includes the duration of the
pre_event frames. Do not back track the video by a further
pre_event_count.

Signed-off-by: Selva Nair <selva.nair@gmail.com>
2019-11-15 21:55:40 -05:00
Selva Nair 2e7fad68d1 Properly compute video buffer length when analysis fps is set
Currently the number of video frames kept in the buffer is set as the
pre_event_count. This falls short when the capture fps is larger
than the analysis fps. Fix by computing the retained video duration
as pre_event_count/analysis_fps

No change if analysis fps is not set.

Signed-off-by: Selva Nair <selva.nair@gmail.com>
2019-11-15 21:55:40 -05:00
Isaac Connor fdf5150a16 fix build on jessie 2019-11-13 13:51:22 -05:00
Isaac Connor 46991f04e6 better debugging when fail to sws_scale 2019-11-01 09:24:22 -04:00
Isaac Connor 21df2c6ac7 Always write snapshot.jpg and alarm.jpg instead of only when using video storage 2019-10-30 16:25:09 -04:00
Isaac Connor 35ae81d985 dynamically allocate next_dts and use it in write_packet to store the next dts value. write_interleaved_packet destroys the passed in packet so we need to store next_dts before writing out the packet. 2019-10-23 09:25:16 -04:00
Isaac Connor 76fd32b427 more debug, and ensure that pts != AV_NOPTS_VALUE 2019-10-22 10:01:24 -04:00
Isaac Connor dfe2f55ebe More debugging to figure out #2720 2019-10-20 13:50:24 -04:00
Isaac Connor d9d91c4a8d Fix #2728 by resetting the frame size before reading from the fifo 2019-10-20 13:32:16 -04:00
Isaac Connor 21dd9b527d when ipkt->pts is AV_NOPTS_VALUE should still set opkt.pts to AV_NOPTS_VALUE 2019-10-19 17:12:19 -04:00
Isaac Connor 7068769a90 zm_send_packet_receive_frame sends 0 as success 2019-10-18 13:52:07 -04:00
Isaac Connor 6a56de41f0 fix parameter order 2019-10-18 13:39:52 -04:00
Isaac Connor 17a7d02275 fix reversal of in_frame/out_frame in VideoStore destructor 2019-10-18 10:16:18 -04:00
Isaac Connor 60ec545683 fix compile warning due to snprintf into a too small char array 2019-10-18 09:43:25 -04:00
Isaac Connor a0f021ee12 Handle the case of flushing resampler by sending NULL 2019-10-17 17:37:36 -04:00
Isaac Connor f938fd83ac keep track of video_next_dts. Use it when packet dts is AV_NOPTS_VALUE. Also handle EAGAIN in send_packet_get_frame etc 2019-10-16 09:01:59 -04:00
Isaac Connor d03de98317 remove carriage returns in ffmpeg log lines 2019-10-16 09:00:39 -04:00
Isaac Connor 90d6e11fb9 If we try to write a packet with dts == AV_NOPTS_VALUE, set it to stream->cur_dts. This might at least give us a playable file. 2019-10-11 14:04:51 -04:00
Isaac Connor 3b586a2abe include stream index and packet queue size in debug message 2019-10-11 13:53:18 -04:00
Isaac Connor 30b5612691 fix case of sql 2019-09-28 12:57:00 -04:00
Isaac Connor 492be7cc33 make last_zoom last_scale last_x and last_y members of the StreamBase object instead of static vars so that we can access them in monitorStream 2019-09-26 13:51:49 -04:00
Isaac Connor b787682fa9 Fix play from pause when not buffering. When change of zoom, send two paused images so that response is instant. Fix some misplaced line feeds. 2019-09-26 13:51:13 -04:00
Isaac Connor 1dda79af46 remove debug 2019-09-25 12:00:00 -04:00
Isaac Connor 15a1b19b42 spaces 2019-09-23 10:53:21 -04:00
Isaac Connor 83e477e6be CaptureAndRecord in remote camera rtsp doesn't work. Remove it. 2019-09-23 10:52:57 -04:00
Isaac Connor ce37fce99c spacing 2019-09-20 08:19:57 -04:00
Isaac Connor 09533c19af Fix %d to %s 2019-09-20 08:19:44 -04:00
Isaac Connor 17e00cec94 Fix setting rtsp_transport when rtsp 2019-09-17 14:58:16 -04:00
Isaac Connor e8e29d62b2 Use dts instead of pts for first values 2019-09-17 12:53:29 -04:00
Isaac Connor 0d347f0cf5 init log early so that we create zmc_m.log instead of undef.log 2019-09-17 11:37:48 -04:00
Isaac Connor 6041616efc add string_toupper function 2019-09-17 11:37:20 -04:00
Isaac Connor 33aa6abf59 Only open log file if we are going to write to it. 2019-09-17 11:36:57 -04:00
Isaac Connor ecde0a7ae0 Add a string_toupper function 2019-09-17 11:11:22 -04:00
Isaac Connor 1a94479751 Cleanup/rework. Handle database connection failure. This can happen if we init logging before config reading. Default terminal log level to warning. Cleanup logInit copying the options in order to populate mLogPath from config. We can handle this in the constructor now. 2019-09-17 11:10:59 -04:00
Isaac Connor 9a3765f6aa spacing and google code style 2019-09-17 10:31:48 -04:00
Isaac Connor 4509c6a239 Don't set rtsp options unless we are using rtsp. Should prevent everyone from reporting the warning about unsupported options. Note that I removed some extra includs that have no business in zm_ffmpeg_camera. 2019-09-17 10:31:31 -04:00
Isaac Connor c8934dac7f Remove useless debug 2019-09-17 10:30:00 -04:00
Isaac Connor cbf9931371 Don't log about calling dbConnect when already connected. We make this call in zm_logger, it is just going to have to be acceptable to call it multiple times. 2019-09-17 10:29:30 -04:00
Isaac Connor 54c14b17d7 Spacing and google code style 2019-09-17 10:28:42 -04:00
Isaac Connor 6925a75831 codec not ready is not an error. Make it a debug 2019-09-15 18:01:38 -04:00
Isaac Connor 0a31a8dab6 Just use pts instead of tracking both first pts and first dts. Should prevent conflicts 2019-09-15 17:53:25 -04:00
Isaac Connor 675cbe8854 code style, add bytes per second read statistic and a code comment about the sleeping 2019-09-14 10:48:39 -04:00
Isaac Connor 306bda86c2 fix sws_get_delay 2019-09-13 21:28:43 -04:00
Isaac Connor eafa0da06f fixes, handle when audio codec isn't open in ffmpeg_camera 2019-09-13 16:06:25 -04:00
Isaac Connor 3a5d1ff3ca Hack in missing bits for ubuntu trusty/libav/avresample 2019-09-13 15:51:35 -04:00
Isaac Connor 5ddd20ed1a refactor code. Handle resample buffering during encoding instead of when closing file 2019-09-13 14:34:53 -04:00
Isaac Connor 701aa8d924 add flushing the resample buffer to get the remaining samples encoded 2019-09-13 10:55:30 -04:00
Isaac Connor 788b5b480b hack to make sync work on resample 2019-09-12 17:59:08 -04:00
Isaac Connor d9d4c6b4ca fix build 2019-09-12 17:26:19 -04:00
Isaac Connor 0a8aba2b76 rework how pts/dts is handled. We still use video_first_pts, but if the result is negative, normalize it to 0. Also now use audio_next_pts/dts to calculate pts when resampling and re-encoding. I believe this resolves the issues with wrong duration in the audio stream. 2019-09-12 16:52:59 -04:00
Isaac Connor 8fb55cdbff Add codec name to zm_dump_codec and zm_dump_codecpar add new functions zm_receive_packet 2019-09-12 16:51:33 -04:00
Isaac Connor 6c6b2d7c6f Fix build 2019-09-09 17:10:40 -04:00
Isaac Connor 097ce5e778 add const to cast 2019-09-09 17:09:01 -04:00
Isaac Connor 792af28c54 return a value from write_packet 2019-09-09 16:55:22 -04:00
Isaac Connor d5aa95e45f cpplint fixes 2019-09-09 16:13:32 -04:00
Isaac Connor d5d4d9d19b ret should be a heap var, not a member of the object. Somehow this also seems to fix crashing on debian buster. I assume the compiler is confused 2019-09-08 16:10:57 -04:00
Isaac Connor 8215fe1c0f Some versions off avcodec libs have pkt_pts and pkt_dts but they have been deprecated and weren't of any use anyways 2019-09-08 16:10:20 -04:00
Isaac Connor 85e0a086b3 fixes #2694 2019-09-03 11:55:37 -04:00
Isaac Connor c80ef0e0ab spacing 2019-08-28 12:20:03 -04:00
Isaac Connor bd3395ac98 introduce VideoStore::write_packet to refactor out duplicated code. Add the ability to receive multiple packets from audio encoder per input packet 2019-08-28 12:19:54 -04:00
Isaac Connor efb8711c02 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-28 11:43:59 -04:00
Isaac Connor 5f0080ef92 Fix crash when using auth_relay=none 2019-08-28 10:34:30 -04:00
Isaac Connor 64d024b0c0 Fix spacing 2019-08-28 10:33:18 -04:00
Isaac Connor 505a041c88 Don't add a final db frame to the event, because there is no jpg for the frame. I don't know why this code was originally added. 2019-08-28 10:17:23 -04:00
Isaac Connor 59940ab675 report pixformat names instead of just #'s on error 2019-08-28 09:19:57 -04:00
Isaac Connor 39620c01ff Add rescaling of pkt pts/dts from audio_out_ctx to audio_out_stream 2019-08-26 16:37:32 -04:00
Isaac Connor b26ed9bf62 Yet more debugging. Also, move pts adjustment to before audio encoding 2019-08-26 16:17:45 -04:00
Isaac Connor 2fe9442257 Fix time_base conversion when flushing audio queue. Add more debugging. COrrect pkt_Duration when resampling audio 2019-08-23 18:17:26 -04:00
Isaac Connor 886a203bf1 Support hwaccel for non-passthrough case as well 2019-08-21 10:11:58 -04:00
Isaac Connor 01e988ffba remove some redundant debugs. Improve some messages 2019-08-20 14:09:47 -04:00
Isaac Connor 4a82ce83a7 quit a bit earlier when stream is broken. 2019-08-20 11:13:38 -04:00
Isaac Connor ed190340b9 fix typo 2019-08-19 11:12:47 -04:00
Isaac Connor 369dd03909 remove errant i 2019-08-18 21:32:19 -04:00
Isaac Connor 503cf6cd24 More backticking of SQL 2019-08-17 14:37:19 -04:00
Isaac Connor efa264e0c7 Fix playing in reverse. Fix not sending first frame. Fix sql problem with backticks. Not being able to open a frame image is now non-fatal. 2019-08-16 10:24:51 -04:00
Isaac Connor c7b6db9be7 Put backticks around all columns and tables in sql to deal with mysql 8 2019-08-14 16:18:21 -04:00
Isaac Connor c1984ad7cb Fix problem calculating mem_size using an int from ImageSize. With camera resolutions going up, width*height*colour could exceed 32bits. So use a guarnteed 53bit type, which fixes the memsize calculations. Fixes #2682 2019-08-11 20:21:37 -04:00
Isaac Connor 5b62c91cc2 Improve some debugging to try to diagnose recent segfault report 2019-08-10 14:46:05 -04:00
Isaac Connor 0cdb43e165 make dump_video_frame a define instead of a function, fix linesize 2019-08-10 14:45:45 -04:00
Isaac Connor bb6d2631c9 Fix hwaccel compile on pi 2019-08-08 09:26:40 -04:00
Isaac Connor 6a9464044b Demote warnings about fixing non-monotonic dts to debug 2019-08-02 08:03:02 -04:00
Isaac Connor 14ed777eeb fix segfault when debbing is turned on for zma 2019-07-31 17:17:54 -04:00
Isaac Connor 90cb5d018a
Fix 2673 (#2675)
* Change MaxFPS to DECIMAL(5,3) to handle values like 1/60 = 0.017

* When fps < 1 we may need to wait longer than 10s.  Also, we cannot sleep for a long time, because we may need to send a keep alive or check the command queue. So limit the sleep to 1s

* Bump version

* Update MaxFPS to Decimal(5,3)

* Fix missing ;
2019-07-31 11:42:38 -04:00
Isaac Connor 48ad8d47fc Add capture_max_fps to monitor object instead of just calculating the delay. 2019-07-31 11:23:02 -04:00
Isaac Connor 4b89ced889 Warn about waiting more than .5s instead of .1 2019-07-26 12:24:36 -04:00
Isaac Connor e5c194e9ee Fix return 403 status code 2019-07-26 12:22:04 -04:00
Isaac Connor 09934ed7f5 Fix sendTextFrame 2019-07-26 12:21:25 -04:00
Isaac Connor 3da12fd141 Add a bunch of debugging 2019-07-26 12:21:15 -04:00
Isaac Connor 0643108ba4 Use fputs instead of fprintf. Spacing and google code style changes 2019-07-26 10:53:48 -04:00
Isaac Connor 1e0c39c632 mostly spacing cleanups. Don't bother setting pkt_duration on resampled frame 2019-07-19 16:28:18 -04:00
Isaac Connor 9a31f8792c return proper error codes when failed auth or fail permissions 2019-07-19 13:55:35 -04:00
Isaac Connor f3166663a5 unref hw_device_ctx on Close. I think this should release all the other hwaccel related stuff 2019-07-19 12:51:31 -04:00
Isaac Connor fcee031785 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-07-17 21:10:46 -04:00
Isaac Connor 542d88b6a4 fix compile without HWCONTEXT 2019-07-17 21:10:24 -04:00
Pliable Pixels a9d01ba3d2 Alarm api (#2665)
* fixed alarm api to use tokens if present

* clearer debug logs for tokens

* space
2019-07-17 20:38:58 -04:00
Pliable Pixels 2b7610a5ac fixed ffmpeg log association to zm log levels (#2664) 2019-07-17 20:37:27 -04:00
Isaac Connor 75af397223 hwFrame isn't defined unless we have HWCONTEXT_H 2019-07-17 20:33:23 -04:00
Isaac Connor 34c141304d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-07-17 10:07:29 -04:00
Isaac Connor ef9fe2dbd6 Free up hwFrame, preventing memleak 2019-07-17 10:06:30 -04:00