diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | PKGBUILD | 1 | ||||
| -rw-r--r-- | testenv/Dockerfile | 1 | ||||
| -rw-r--r-- | web/share/js/kvm/janus.js | 26 | ||||
| -rw-r--r-- | web/share/js/kvm/stream.js | 19 |
5 files changed, 48 insertions, 0 deletions
@@ -126,6 +126,7 @@ run: testenv $(TESTENV_GPIO) && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ && cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \ && cp /usr/share/kvmd/configs.default/kvmd/web.css /etc/kvmd \ + && cp /usr/share/kvmd/web/share/js/kvm/janus.js /usr/share/janus/javascript/janus.js \ && nginx -c /etc/kvmd/nginx/nginx.conf -g 'user http; error_log stderr;' \ && ln -s $(TESTENV_VIDEO) /dev/kvmd-video \ && ln -s $(TESTENV_GPIO) /dev/kvmd-gpio \ @@ -71,6 +71,7 @@ depends=( iproute2 dnsmasq ipmitool + janus-gateway-pikvm "raspberrypi-io-access>=0.5" "ustreamer>=3.20" diff --git a/testenv/Dockerfile b/testenv/Dockerfile index ffaecfbe..b9b03d8d 100644 --- a/testenv/Dockerfile +++ b/testenv/Dockerfile @@ -75,6 +75,7 @@ RUN git clone https://github.com/pikvm/ustreamer \ && rm -rf ustreamer RUN mkdir -p \ + /usr/share/janus/javascript \ /etc/kvmd/{nginx,vnc} \ /var/lib/kvmd/msd/{images,meta} \ /opt/vc/bin \ diff --git a/web/share/js/kvm/janus.js b/web/share/js/kvm/janus.js new file mode 100644 index 00000000..5ad7ae21 --- /dev/null +++ b/web/share/js/kvm/janus.js @@ -0,0 +1,26 @@ +/***************************************************************************** +# # +# KVMD - The main Pi-KVM daemon. # +# # +# Copyright (C) 2018-2021 Maxim Devaev <[email protected]> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <https://www.gnu.org/licenses/>. # +# # +*****************************************************************************/ + + +"use strict"; + + +export var Janus = null; diff --git a/web/share/js/kvm/stream.js b/web/share/js/kvm/stream.js index 1a5d1c67..1008cb92 100644 --- a/web/share/js/kvm/stream.js +++ b/web/share/js/kvm/stream.js @@ -25,8 +25,27 @@ import {tools, $} from "../tools.js"; import {wm} from "../wm.js"; +/*import {Janus} from "./janus.js"; +function _JanusStreamer(set_active_callback, set_inactive_callback, set_info_callback) { + var self = this; + + var __janus = null; + var __handle = null; + var __bitrate_timer = null; + + self.getResolution = function() { + let el_video = $("stream-video"); + return { + real_width: el_video.videoWidth, + real_height: el_video.videoHeight, + view_width: el_video.offsetWidth, + view_height: el_video.offsetHeight, + }; + }; +};*/ + function _MjpegStreamer(set_active_callback, set_inactive_callback, set_info_callback) { var self = this; |