diff --git a/HISTORY.txt b/HISTORY.txt index 6707a42..d891c3c 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -5,6 +5,7 @@ Simple x264/x265 Launcher version history Version 3.02 [2021-06-16] * Updated x264 to revision 3094 (API v164) * Updated x265 to version 3.5+37 +* Updated NVEncC to version 6.05 * Updated build environment to Visual Studio 2022 with Update-2 Version 3.01 [2021-12-08] diff --git a/src/encoder_nvencc.cpp b/src/encoder_nvencc.cpp index 2854d1f..2b8461d 100644 --- a/src/encoder_nvencc.cpp +++ b/src/encoder_nvencc.cpp @@ -40,7 +40,7 @@ #include //x265 version info -static const unsigned int VERSION_NVENCC_MINIMUM_VER = 541; +static const unsigned int VERSION_NVENCC_MINIMUM_VER = 605; // ------------------------------------------------------------ // Helper Macros @@ -108,6 +108,8 @@ while(0) // Encoder Info // ------------------------------------------------------------ +#define NVENCCC_PATH "%1/toolset/%2/nvencc/" + class NVEncEncoderInfo : public AbstractEncoderInfo { public: @@ -213,12 +215,20 @@ public: default: MUTILS_THROW("Unknown encoder variant!"); } - return QStringList() - << QString("%1/toolset/%2/nvencc/avcodec-58.dll" ).arg(sysinfo->getAppPath(), arch) - << QString("%1/toolset/%2/nvencc/avfilter-7.dll" ).arg(sysinfo->getAppPath(), arch) - << QString("%1/toolset/%2/nvencc/avformat-58.dll" ).arg(sysinfo->getAppPath(), arch) - << QString("%1/toolset/%2/nvencc/avutil-56.dll" ).arg(sysinfo->getAppPath(), arch) - << QString("%1/toolset/%2/nvencc/swresample-3.dll").arg(sysinfo->getAppPath(), arch); + QStringList dependencies; + dependencies << QString(NVENCCC_PATH "avcodec-59.dll" ).arg(sysinfo->getAppPath(), arch); + dependencies << QString(NVENCCC_PATH "avfilter-8.dll" ).arg(sysinfo->getAppPath(), arch); + dependencies << QString(NVENCCC_PATH "avformat-59.dll" ).arg(sysinfo->getAppPath(), arch); + dependencies << QString(NVENCCC_PATH "avutil-57.dll" ).arg(sysinfo->getAppPath(), arch); + dependencies << QString(NVENCCC_PATH "libass-9.dll" ).arg(sysinfo->getAppPath(), arch); + dependencies << QString(NVENCCC_PATH "swresample-4.dll").arg(sysinfo->getAppPath(), arch); + if (encArch) + { + dependencies << QString(NVENCCC_PATH "libvmaf.dll" ).arg(sysinfo->getAppPath(), arch); + dependencies << QString(NVENCCC_PATH "nvrtc64_101_0.dll" ).arg(sysinfo->getAppPath(), arch); + dependencies << QString(NVENCCC_PATH "nvrtc-builtins64_101.dll").arg(sysinfo->getAppPath(), arch); + } + return dependencies; } virtual QString getHelpCommand(void) const