Commit Graph

20487 Commits (a7f586a46dc64b7dd625f1cae4b17a2466d50130)

Author SHA1 Message Date
Uve M Steinmann a332bbbbc9 Added missing steps to Debian 11 installion docs 2022-04-22 21:55:07 -03:00
Isaac Connor 13b0cdccbd Use getStreamHTML to include the state and zones html 2022-04-22 16:00:50 -04:00
Isaac Connor b15b0281be Use getStreamHTML to include the state html 2022-04-22 16:00:27 -04:00
Isaac Connor 8d89639e2f Include the padding when figureing the scaling 2022-04-22 15:59:58 -04:00
Isaac Connor a5bb2535d8 Include the padding when figureing the scaling 2022-04-22 15:59:54 -04:00
Isaac Connor d584b8ec21 Remove CMD_ defines because they are now in skin.js.php 2022-04-22 15:54:33 -04:00
Isaac Connor 44ace76e2e Remove CMD_ defines because they are now in skin.js.php 2022-04-22 15:54:19 -04:00
Isaac Connor 003b23f171 Set img to 100% so it fills the frame 2022-04-22 15:53:27 -04:00
Isaac Connor 647bd69fc8 Move CMD_ defines to skin.js.php so that they are available everywhere 2022-04-22 15:52:34 -04:00
Isaac Connor e47d1bcd07 Set imageFrame.monitor to 100%, don't float the .monitor and be more specific about styles for zonePoints so they don't affect other divs 2022-04-22 15:52:08 -04:00
Isaac Connor 2fb44769b6 split setScale into setStreamScale so we can set the img.src without altering the frame 2022-04-22 15:50:55 -04:00
Isaac Connor 07e6ae931f Add mid and zid to zone polygon so that we can use them in atached onclicks 2022-04-22 15:50:00 -04:00
Isaac Connor e5db510798 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-22 13:07:59 -04:00
Isaac Connor 1997a1b6d9 Fix reversed logic preventing warning about no video saving 2022-04-22 13:07:40 -04:00
Isaac Connor 348441ac46 Deprecate scale == auto 2022-04-22 13:07:11 -04:00
Isaac Connor 0d176b133a Stop and restart statusCmdReq around rescaling img stream. Deprecate auto as a value for scale. Make another attempt as sanely applying scale 2022-04-22 12:34:49 -04:00
Isaac Connor 889cb7df18 Add workaround for old string values of scale 2022-04-22 12:33:36 -04:00
Isaac Connor ccfbed6735 remove setting time base I don't know which version of ffmpe supports this, but not mine so it isn't solving the problem I thought it was 2022-04-21 17:00:10 -04:00
Isaac Connor 1fbd730968 Include libavdevice-dev 2022-04-21 10:47:57 -04:00
Isaac Connor 1a6f651424 time_base requires newer ffmpeg 2022-04-21 10:36:28 -04:00
Isaac Connor dd86be0811 Add libavdevice-dev 2022-04-21 10:32:51 -04:00
Isaac Connor c370b2b028 Have to specify libavdevice58 2022-04-21 10:31:07 -04:00
Isaac Connor 66b4902fd1 Clean up default layout code to match 1.36.15 2022-04-21 09:28:37 -04:00
Isaac Connor be0037a17a Revert scale=auto to be scale='0' 2022-04-21 09:26:23 -04:00
Isaac Connor a05488b758 Put auto back to '0' because it needs to be for saving monitors 2022-04-21 09:25:46 -04:00
Isaac Connor 0eb358aecf Make video tag for janus 100% width so that it scales likes img does 2022-04-21 09:24:03 -04:00
Isaac Connor 768941b020 Make video tags 100% as well as img so that janus scales 2022-04-20 18:48:19 -04:00
Isaac Connor 8170ce2b8d Check error instead of textStatus for Unauthorized. Set streamCmdParams.auth when auth_hash changes. Fixes auth timing out in ajax 2022-04-20 18:47:57 -04:00
Isaac Connor 8ed50ea435 pkt_duration isn't use for decoding so don't bother setting it. Set the time base for the frame. Reduce content in debug logging. 2022-04-20 18:47:09 -04:00
Isaac Connor c2dcaab744 fix eslint 2022-04-20 10:00:47 -04:00
Isaac Connor e7dcfa6166 Put back code that calculates how long it takes to send a frame, but make it just a debug instead of a warning when we are too slow 2022-04-20 09:58:37 -04:00
Isaac Connor fc9b2913f1 Put back libavdevice requirement 2022-04-20 09:45:54 -04:00
Isaac Connor 41cbc1afed Must define CMD_QUIT 2022-04-20 09:39:12 -04:00
Isaac Connor a047cedd47 Initialize Poll_Trigger_State(false),
+  Event_Poller_Healthy(false),
2022-04-20 09:10:46 -04:00
Isaac Connor 0501f464c5 Fix scale <0 and send zms a quit command because safari will never close the stream. Fixes no image on safari 2022-04-19 19:30:27 -04:00
Isaac Connor 1561ad140a Merge branch 'master' into fix_viewing 2022-04-19 17:09:02 -04:00
Isaac Connor ff46f78ab4 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-19 17:08:19 -04:00
Isaac Connor 5672b2c195 Try out options to improve latency 2022-04-19 17:08:16 -04:00
Isaac Connor 91a5642edc merge 2022-04-19 17:07:20 -04:00
Isaac Connor b519e3b388 spacing, default to fixed when appropriate, include state html if not website 2022-04-19 17:06:34 -04:00
Isaac Connor 3885d853f9 Don't need to use a random start on watch 2022-04-19 17:05:41 -04:00
Isaac Connor aedfca22d6 reorg code a bit. Implement setting width & height in REQUEST 2022-04-19 16:59:11 -04:00
Isaac Connor 4393d2b9de Add CMD_STOP, convert to consts 2022-04-19 16:58:33 -04:00
Isaac Connor 61bdcc53ab add debugging and put back code in setLayout to call setScale. Add onclick to navbar elements to stop streaming when clicked. 2022-04-19 16:58:17 -04:00
Isaac Connor 4785954140 Add comments to scaleToFit 2022-04-19 16:57:30 -04:00
Isaac Connor c171c47d58 Don't remove fixed 2022-04-19 16:56:40 -04:00
Isaac Connor 21716e994b Keep better track of timers. Add img_onerror to report when image breaks. setScale is a mess. Add some more code to guess image scale. Browser can't handle 4k jpeg streams. scaling is a must. 2022-04-19 16:56:21 -04:00
Isaac Connor 1eaeccc564 Handle zones not being set in options 2022-04-19 12:31:43 -04:00
Isaac Connor 4154731f13 test for ctx->sw_pix_fmt being AV_PIX_FMT_NONE before trying to do do hwdevice transfer 2022-04-18 18:06:05 -04:00
Isaac Connor f8366864b5 Remove dead code 2022-04-18 18:05:32 -04:00