Fix various issues

selkies-project · Mar 22, 2024 · 963fc7f · 963fc7f
1 parent f4d7b72
commit 963fc7f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/addons/gst-web/src/css/vuetify.css b/addons/gst-web/src/css/vuetify.css
diff --git a/addons/gst-web/src/index.html b/addons/gst-web/src/index.html
@@ -360,7 +360,7 @@
       </div>
 
       <div id="video_container" class="video-container">
-        <video id="stream" class="video" preload="none" playsinline>
+        <video id="stream" class="video" preload="none" disablePictureInPicture="true" playsinline>
           Your browser doesn't support video
         </video>
       </div>

diff --git a/addons/gst-web/src/input.js b/addons/gst-web/src/input.js
@@ -495,8 +495,8 @@ class Input {
     /**
      * When fullscreen is entered, request keyboard and pointer lock.
      */
-    _onFullscreenChange() {
-        if (document.fullscreenElement !== null) {
+    _onFullscreenChange(e) {
+        if (e.matches) {
             // Enter fullscreen
             this.requestKeyboardLock();
             this.element.requestPointerLock();
@@ -540,7 +540,7 @@ class Input {
         this.listeners.push(addListener(this.element, 'resize', this._windowMath, this));
         this.listeners.push(addListener(this.element, 'wheel', this._mouseWheelWrapper, this));
         this.listeners.push(addListener(this.element, 'contextmenu', this._contextMenu, this));
-        this.listeners.push(addListener(this.element.parentElement, 'fullscreenchange', this._onFullscreenChange, this));
+        this.listeners.push(addListener(window.matchMedia('(display-mode: fullscreen)'), 'change', this._onFullscreenChange, this));
         this.listeners.push(addListener(document, 'pointerlockchange', this._pointerLock, this));
         this.listeners.push(addListener(window, 'keydown', this._key, this));
         this.listeners.push(addListener(window, 'keyup', this._key, this));

diff --git a/addons/gstreamer/Dockerfile b/addons/gstreamer/Dockerfile
@@ -87,18 +87,18 @@ ARG GSTREAMER_VERSION=1.24.1
 RUN git clone -b "${GSTREAMER_VERSION}" --single-branch --depth 1 "https://gitlab.freedesktop.org/gstreamer/gstreamer.git" && cd gstreamer && \
     mkdir -p /opt/gstreamer && \
     . "$HOME/.cargo/env" && \
-    meson setup --prefix /opt/gstreamer -Dbuildtype=release -Dpython=enabled -Drs=enabled -Dgpl=enabled -Dbad=enabled -Dugly=enabled -Dlibav=enabled -Dgst-plugins-good:v4l2=enabled -Dgst-plugins-bad:qsv=enabled -Dgst-plugins-bad:va=enabled -Dgst-plugins-bad:v4l2codecs=enabled -Dgst-plugins-bad:openh264=enabled -Dgst-plugins-ugly:x264=enabled -Ddoc=disabled -Dexamples=disabled -Dtests=disabled builddir && \
+    meson setup --prefix /opt/gstreamer -Dbuildtype=release -Dpython=enabled -Drs=enabled -Dgpl=enabled -Dbad=enabled -Dugly=enabled -Dlibav=enabled -Dgst-plugins-good:vpx=enabled -Dgst-plugins-bad:qsv=enabled -Dgst-plugins-bad:va=enabled -Dgst-plugins-bad:nvcodec=enabled -Dgst-plugins-good:v4l2=enabled -Dgst-plugins-bad:v4l2codecs=enabled -Dgst-plugins-bad:openh264=enabled -Dgst-plugins-ugly:x264=enabled -Ddoc=disabled -Dexamples=disabled -Dtests=disabled builddir && \
     ninja -C builddir -j "$(nproc)" && \
     meson install -C builddir
 
 # Generate environment file
 RUN MULTI_ARCH="$(gcc -print-multiarch | sed -e 's/i.*86/i386/')" && \
-    echo "export GSTREAMER\_PATH\=\$\{GSTREAMER\_PATH\:\-/opt/gstreamer\}\n\
-export PATH\=\$\{GSTREAMER\_PATH\}/bin\:\$\{PATH\}\n\
-export LD\_LIBRARY\_PATH\=\$\{GSTREAMER\_PATH\}/lib/${MULTI_ARCH}\:\$\{LD\_LIBRARY\_PATH\}\n\
-export GI\_TYPELIB\_PATH\=\$\{GSTREAMER\_PATH\}/lib/${MULTI_ARCH}/girepository\-1\.0\:/usr/lib/${MULTI_ARCH}/girepository\-1\.0\:\$\{GI\_TYPELIB\_PATH\}\n\
-GST\_PY\_PATH\=\$\(find \$\{GSTREAMER\_PATH\}/lib \-type d \-name \"python3\.\*\"\)\n\
-export PYTHONPATH\=\$\{GST\_PY\_PATH\}/site\-packages\:\$\{GSTREAMER\_PATH\}/lib/python3/dist\-packages\:\$\{PYTHONPATH\}\n\
+    echo "export GSTREAMER_PATH=\${GSTREAMER_PATH:-/opt/gstreamer}\n\
+export PATH=\${GSTREAMER_PATH}/bin:\${PATH}\n\
+export LD_LIBRARY_PATH=\${GSTREAMER_PATH}/lib/${MULTI_ARCH}:\${LD_LIBRARY_PATH}\n\
+export GI_TYPELIB_PATH=\${GSTREAMER_PATH}/lib/${MULTI_ARCH}/girepository-1.0:/usr/lib/${MULTI_ARCH}/girepository-1.0:\${GI_TYPELIB_PATH}\n\
+GST_PY_PATH=\$(find \${GSTREAMER_PATH}/lib -type d -name "python3.*")\n\
+export PYTHONPATH=\${GST_PY_PATH}/site-packages:\${GSTREAMER_PATH}/lib/python3/dist-packages:\${PYTHONPATH}\n\
 " > /opt/gstreamer/gst-env
 
 # Bundle build result to tarball