diff --git a/Build.cn.md b/Build.cn.md index 274d972c..62e503de 100644 --- a/Build.cn.md +++ b/Build.cn.md @@ -93,7 +93,7 @@ export CUDA_PATH=/usr/local/cuda ```Shell sudo apt install ffmpeg \ libavcodec-extra libavcodec-dev libavutil-dev libavformat-dev libswresample-dev libavfilter-dev libavdevice-dev \ - libass-dev + libass-dev libx11-dev libplacebo-dev ``` ### 5. [可选] 安装 AvisynthPlus diff --git a/Build.en.md b/Build.en.md index 8ac637cb..bb3f1136 100644 --- a/Build.en.md +++ b/Build.en.md @@ -120,7 +120,7 @@ Install ffmpeg and other required libraries. ```Shell sudo apt install ffmpeg \ libavcodec-extra libavcodec-dev libavutil-dev libavformat-dev libswresample-dev libavfilter-dev libavdevice-dev \ - libass-dev + libass-dev libx11-dev libplacebo-dev ``` ### 5. [Optional] Install AvisynthPlus diff --git a/Build.ja.md b/Build.ja.md index b4b02183..125fe47d 100644 --- a/Build.ja.md +++ b/Build.ja.md @@ -122,7 +122,7 @@ ffmpegと関連ライブラリを導入します。 ```Shell sudo apt install \ libavcodec-extra libavcodec-dev libavutil-dev libavformat-dev libswresample-dev libavfilter-dev libavdevice-dev \ - libass-dev + libass-dev libx11-dev libplacebo-dev ``` ### 5. [オプション] AvisynthPlusのビルド diff --git a/NVEncCore/NVEncCmd.cpp b/NVEncCore/NVEncCmd.cpp index 3236df6a..b9f66b74 100644 --- a/NVEncCore/NVEncCmd.cpp +++ b/NVEncCore/NVEncCmd.cpp @@ -363,6 +363,7 @@ tstring encoder_help() { str += _T("") _T(" --disable-nvml disable NVML GPU monitoring (default 0, 0-2)\n"); _T(" --disable-dx11 disable DX11 initilization.\n"); + _T(" --disable-vulkan disable Vulkan initilization.\n"); str += gen_cmd_help_ctrl(); return str; } @@ -1524,6 +1525,10 @@ int parse_one_option(const TCHAR *option_name, const TCHAR* strInput[], int& i, pParams->disableDX11 = true; return 0; } + if (IS_OPTION("disable-vulkan")) { + pParams->disableVulkan = true; + return 0; + } auto ret = parse_one_input_option(option_name, strInput, i, nArgNum, &pParams->input, &pParams->inprm, argData); if (ret >= 0) return ret; @@ -1900,6 +1905,7 @@ tstring gen_cmd(const InEncodeVideoParam *pParams, const NV_ENC_CODEC_CONFIG cod OPT_NUM(_T("--session-retry"), sessionRetry); OPT_NUM(_T("--disable-nvml"), disableNVML); OPT_BOOL(_T("--disable-dx11"), _T(""), disableDX11); + OPT_BOOL(_T("--disable-vulkan"), _T(""), disableVulkan); cmd << gen_cmd(&pParams->ctrl, &encPrmDefault.ctrl, save_disabled_prm); diff --git a/build_deb.sh b/build_deb.sh index e18bd041..6a89f99e 100755 --- a/build_deb.sh +++ b/build_deb.sh @@ -26,7 +26,7 @@ if [ -e /etc/lsb-release ]; then PACKAGE_DEPENDS="${PACKAGE_DEPENDS},libavcodec58,libavutil56,libavformat58,libswresample3,libavfilter7,libavdevice58,libass9" elif [ "${PACKAGE_OS_CODENAME}" = "noble" ]; then PACKAGE_DEPENDS="libc6(>=2.22),libstdc++6(>=6)" - PACKAGE_DEPENDS="${PACKAGE_DEPENDS},libavcodec60,libavutil58,libavformat60,libswresample4,libavfilter9,libavdevice60,libass9" + PACKAGE_DEPENDS="${PACKAGE_DEPENDS},libavcodec60,libavutil58,libavformat60,libswresample4,libavfilter9,libavdevice60,libass9,libplacebo338" else echo "${PACKAGE_OS_ID}${PACKAGE_OS_VER} ${PACKAGE_OS_CODENAME} not supported in this script!" exit 1 diff --git a/docker/docker_ubuntu2404_cuda12 b/docker/docker_ubuntu2404_cuda12 index 76d67563..4de441cd 100644 --- a/docker/docker_ubuntu2404_cuda12 +++ b/docker/docker_ubuntu2404_cuda12 @@ -32,6 +32,8 @@ RUN apt update \ libass-dev \ openssl \ libssl-dev \ + libx11-dev \ + libplacebo-dev \ && wget -q https://developer.download.nvidia.com/compute/cuda/repos/${OSVER}/x86_64/cuda-${OSVER}.pin \ && mv cuda-${OSVER}.pin /etc/apt/preferences.d/cuda-repository-pin-600 \ && wget -q ${CUDA_DEB_URL} \