Disable HW accelration on Neko (not sure why this is not working)

This commit is contained in:
Josh.5
2022-09-17 20:41:20 +12:00
committed by Josh Sunnex
parent a3294eb582
commit 686f76bc95
3 changed files with 25 additions and 6 deletions

View File

@@ -374,11 +374,17 @@ RUN \
&& \
echo
# Setup browser audio streaming deps
# Setup video/audio streaming deps
RUN \
echo "**** Update apt database ****" \
&& apt-get update \
&& \
echo "**** Install Intel media drivers and VAAPI ****" \
&& apt-get install -y --no-install-recommends \
intel-media-va-driver-non-free \
libva2 \
vainfo \
&& \
echo "**** Install audio streaming deps ****" \
&& apt-get install -y --no-install-recommends \
bzip2 \
@@ -386,11 +392,14 @@ RUN \
gstreamer1.0-gl \
gstreamer1.0-gtk3 \
gstreamer1.0-libav \
gstreamer1.0-plugins-bad \
gstreamer1.0-plugins-base \
gstreamer1.0-plugins-good \
gstreamer1.0-plugins-ugly \
gstreamer1.0-pulseaudio \
gstreamer1.0-qt5 \
gstreamer1.0-tools \
gstreamer1.0-vaapi \
gstreamer1.0-x \
libgstreamer1.0-0 \
libncursesw5 \

View File

@@ -21,11 +21,18 @@ if ([ "${MODE}" != "s" ] && [ "${MODE}" != "secondary" ]); then
fi
# Configure hardware acceleration if it is not already set
if [[ -z ${NEKO_HWENC} ]]; then
# Enable VAAPI if device available
if [[ ! -z $(stat -c "%g" /dev/dri/render* | tail -n 1) ]]; then
export NEKO_HWENC=vaapi
fi
# if [[ -z ${NEKO_HWENC} ]]; then
# # Enable VAAPI if device available
# if [[ ! -z $(stat -c "%g" /dev/dri/render* | tail -n 1) ]]; then
# echo "Setting Neko to use VAAPI encoder"
# export NEKO_HWENC="VAAPI"
# # Check for vp8 vaapi encoder
# echo "Setting Neko to use 264 encoding"
# # export NEKO_VP8="false"
# # export NEKO_VP9="false"
# export NEKO_H264="true"
# fi
# fi
fi
else
echo "Disable Neko server"

View File

@@ -4,6 +4,9 @@ autostart=false
autorestart=true
priority=30
user=%(ENV_USER)s
# /usr/bin/neko serve --static "/var/www" --display ${DISPLAY} --bind :${PORT_NOVNC_WEB}
# /usr/bin/neko serve --static "/var/www" --display ${DISPLAY} --bind :${PORT_NOVNC_WEB} --nat1to1 $(ip route get 1 | awk '{print $(NF-2);exit}') --screen 1280x720@30 --hwenc VAAPI --h264
# /usr/bin/neko serve --static "/var/www" --display ${DISPLAY} --bind :${PORT_NOVNC_WEB} --nat1to1 $(ip route get 1 | awk '{print $(NF-2);exit}') --screen 1280x720@30 --vp8
command=/usr/bin/neko serve --static "/var/www" --display %(ENV_DISPLAY)s --bind :%(ENV_PORT_NOVNC_WEB)s
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s",XDG_RUNTIME_DIR="%(ENV_XDG_RUNTIME_DIR)s"
stopsignal=INT