Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-05-31 12:14:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Only enable intel hwaccel libs on amd64

Browse Source
This commit is contained in:
Zoe Roux 2024-02-26 02:53:26 +01:00
parent b035ad07ec
commit 8b6741641c
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
transcoder/Dockerfile
View File

@ -33,11 +33,20 @@ RUN go build -o ./transcoder
# we use trixie (debian's testing because ffmpeg on latest is v5 and we need v6) # we use trixie (debian's testing because ffmpeg on latest is v5 and we need v6)
# https://packages.debian.org/bookworm/ffmpeg for version tracking # https://packages.debian.org/bookworm/ffmpeg for version tracking
FROM debian:trixie-slim FROM debian:trixie-slim
# read target arch from buildx or default to amd64 if using legacy builder.
ARG TARGETARCH
ENV TARGETARCH=${TARGETARCH:-amd64}
RUN echo $TARGETARCH
RUN sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list.d/debian.sources RUN sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list.d/debian.sources
RUN apt-get update \ RUN set -x && apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y \ && apt-get install --no-install-recommends --no-install-suggests -y \
# runtime dependencies
ffmpeg libmediainfo-dev \ ffmpeg libmediainfo-dev \
vainfo mesa-va-drivers intel-media-va-driver-non-free i965-va-driver-shaders \ # hwaccel dependencies
vainfo mesa-va-drivers \
# intel hwaccel dependencies, not available everywhere
$([ " $TARGETARCH" = " amd64" ] && echo "intel-media-va-driver-non-free i965-va-driver-shaders") \
&& apt-get clean autoclean -y \ && apt-get clean autoclean -y \
&& apt-get autoremove -y \ && apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

8
transcoder/Dockerfile.dev
View File

@ -23,6 +23,10 @@ ENV SSL_CERT_DIR=/etc/ssl/certs
RUN update-ca-certificates RUN update-ca-certificates
RUN go install github.com/bokwoon95/wgo@latest RUN go install github.com/bokwoon95/wgo@latest
# read target arch from buildx or default to amd64 if using legacy builder.
ARG TARGETARCH
ENV TARGETARCH=${TARGETARCH:-amd64}
RUN sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list.d/debian.sources RUN sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list.d/debian.sources
RUN apt-get update \ RUN apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y \ && apt-get install --no-install-recommends --no-install-suggests -y \
@ -31,7 +35,9 @@ RUN apt-get update \
# build dependencies # build dependencies
libavutil-dev libswscale-dev libmediainfo-dev \ libavutil-dev libswscale-dev libmediainfo-dev \
# hwaccel dependencies # hwaccel dependencies
vainfo mesa-va-drivers intel-media-va-driver-non-free i965-va-driver-shaders \ vainfo mesa-va-drivers \
# intel hwaccel dependencies, not available everywhere
$([ " $TARGETARCH" = " amd64" ] && echo "intel-media-va-driver-non-free i965-va-driver-shaders") \
&& apt-get clean autoclean -y \ && apt-get clean autoclean -y \
&& apt-get autoremove -y && apt-get autoremove -y
WORKDIR /app WORKDIR /app

1
transcoder/src/hwaccel.go
View File

@ -69,6 +69,7 @@ func DetectHardwareAccel() HwAccelT {
Name: name, Name: name,
DecodeFlags: []string{ DecodeFlags: []string{
"-hwaccel", "qsv", "-hwaccel", "qsv",
// "-qsv_device", GetEnvOr("GOTRANSCODER_QSV_RENDERER", "/dev/dri/renderD128"),
"-hwaccel_output_format", "qsv", "-hwaccel_output_format", "qsv",
}, },
EncodeFlags: []string{ EncodeFlags: []string{