Remove nv-codec-headers and stop building NVDEC
- NVDEC is disabled by default in Moonlight Qt now - NVDEC is superseded by Vulkan Video - NVDEC is only built into the desktop packages which we don't publish
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -1,9 +1,6 @@
|
||||
[submodule "FFmpeg"]
|
||||
path = FFmpeg
|
||||
url = https://github.com/cgutman/FFmpeg.git
|
||||
[submodule "nv-codec-headers"]
|
||||
path = nv-codec-headers
|
||||
url = https://git.videolan.org/git/ffmpeg/nv-codec-headers.git
|
||||
[submodule "SDL2"]
|
||||
path = SDL2
|
||||
url = https://github.com/libsdl-org/SDL.git
|
||||
|
||||
@@ -11,7 +11,6 @@ RUN /bin/bash -c /opt/scripts/install-base-deps.sh && \
|
||||
|
||||
COPY dav1d /opt/dav1d
|
||||
COPY FFmpeg /opt/FFmpeg
|
||||
COPY nv-codec-headers /opt/nv-codec-headers
|
||||
COPY SDL2 /opt/SDL2
|
||||
COPY SDL_ttf /opt/SDL_ttf
|
||||
|
||||
|
||||
Submodule nv-codec-headers deleted from 625b3199e9
@@ -11,12 +11,8 @@ elif [ "$TARGET" == "l4t" ]; then
|
||||
# Enable NVV4L2 decoders (and VP9 decoder to work around compilation error in NVV4L2 fallback code)
|
||||
EXTRA_FFMPEG_ARGS="--enable-nvv4l2 --enable-decoder=h264_nvv4l2 --enable-decoder=hevc_nvv4l2 --enable-decoder=vp9"
|
||||
elif [ "$TARGET" == "desktop" ]; then
|
||||
# We need to install the NVDEC headers
|
||||
cd /opt/nv-codec-headers
|
||||
make install
|
||||
|
||||
# Enable VAAPI, VDPAU, and NVDEC decoders
|
||||
EXTRA_FFMPEG_ARGS="--enable-nvdec --enable-hwaccel=h264_nvdec --enable-hwaccel=hevc_nvdec --enable-hwaccel=av1_nvdec --enable-hwaccel=h264_vaapi --enable-hwaccel=hevc_vaapi --enable-hwaccel=av1_vaapi --enable-hwaccel=h264_vdpau --enable-hwaccel=hevc_vdpau --enable-hwaccel=av1_vdpau"
|
||||
# Enable VAAPI and VDPAU decoders (TODO: Add Vulkan Video if we ever actually ship this for desktop platforms)
|
||||
EXTRA_FFMPEG_ARGS="--enable-hwaccel=h264_vaapi --enable-hwaccel=hevc_vaapi --enable-hwaccel=av1_vaapi --enable-hwaccel=h264_vdpau --enable-hwaccel=hevc_vdpau --enable-hwaccel=av1_vdpau"
|
||||
elif [ "$TARGET" == "embedded" ]; then
|
||||
# Enable stateless V4L2 support
|
||||
EXTRA_FFMPEG_ARGS="--enable-v4l2-request --enable-hwaccel=h264_v4l2request --enable-hwaccel=hevc_v4l2request"
|
||||
|
||||
Reference in New Issue
Block a user