| 修订版 | fc49f8a14a3e9e5196cb8b955970b3198002a8ba (tree) |
|---|---|
| 时间 | 2022-06-16 23:19:46 |
| 作者 |  lordmulder <mulder2@gmx....> |
| Commiter | lordmulder |
Bump NVEncC binaries to version 6.05 + updated detection NVEncC of dependencies.
HISTORY.txt (diff)
src/encoder_nvencc.cpp (diff)| @@ -5,6 +5,7 @@ Simple x264/x265 Launcher version history | ||
| 5 | 5 | Version 3.02 [2021-06-16] |
| 6 | 6 | * Updated x264 to revision 3094 (API v164) |
| 7 | 7 | * Updated x265 to version 3.5+37 |
| 8 | +* Updated NVEncC to version 6.05 | |
| 8 | 9 | * Updated build environment to Visual Studio 2022 with Update-2 |
| 9 | 10 | |
| 10 | 11 | Version 3.01 [2021-12-08] |
| @@ -40,7 +40,7 @@ | ||
| 40 | 40 | #include <QPair> |
| 41 | 41 | |
| 42 | 42 | //x265 version info |
| 43 | -static const unsigned int VERSION_NVENCC_MINIMUM_VER = 541; | |
| 43 | +static const unsigned int VERSION_NVENCC_MINIMUM_VER = 605; | |
| 44 | 44 | |
| 45 | 45 | // ------------------------------------------------------------ |
| 46 | 46 | // Helper Macros |
| @@ -108,6 +108,8 @@ while(0) | ||
| 108 | 108 | // Encoder Info |
| 109 | 109 | // ------------------------------------------------------------ |
| 110 | 110 | |
| 111 | +#define NVENCCC_PATH "%1/toolset/%2/nvencc/" | |
| 112 | + | |
| 111 | 113 | class NVEncEncoderInfo : public AbstractEncoderInfo |
| 112 | 114 | { |
| 113 | 115 | public: |
| @@ -213,12 +215,20 @@ public: | ||
| 213 | 215 | default: MUTILS_THROW("Unknown encoder variant!"); |
| 214 | 216 | |
| 215 | 217 | } |
| 216 | - return QStringList() | |
| 217 | - << QString("%1/toolset/%2/nvencc/avcodec-58.dll" ).arg(sysinfo->getAppPath(), arch) | |
| 218 | - << QString("%1/toolset/%2/nvencc/avfilter-7.dll" ).arg(sysinfo->getAppPath(), arch) | |
| 219 | - << QString("%1/toolset/%2/nvencc/avformat-58.dll" ).arg(sysinfo->getAppPath(), arch) | |
| 220 | - << QString("%1/toolset/%2/nvencc/avutil-56.dll" ).arg(sysinfo->getAppPath(), arch) | |
| 221 | - << QString("%1/toolset/%2/nvencc/swresample-3.dll").arg(sysinfo->getAppPath(), arch); | |
| 218 | + QStringList dependencies; | |
| 219 | + dependencies << QString(NVENCCC_PATH "avcodec-59.dll" ).arg(sysinfo->getAppPath(), arch); | |
| 220 | + dependencies << QString(NVENCCC_PATH "avfilter-8.dll" ).arg(sysinfo->getAppPath(), arch); | |
| 221 | + dependencies << QString(NVENCCC_PATH "avformat-59.dll" ).arg(sysinfo->getAppPath(), arch); | |
| 222 | + dependencies << QString(NVENCCC_PATH "avutil-57.dll" ).arg(sysinfo->getAppPath(), arch); | |
| 223 | + dependencies << QString(NVENCCC_PATH "libass-9.dll" ).arg(sysinfo->getAppPath(), arch); | |
| 224 | + dependencies << QString(NVENCCC_PATH "swresample-4.dll").arg(sysinfo->getAppPath(), arch); | |
| 225 | + if (encArch) | |
| 226 | + { | |
| 227 | + dependencies << QString(NVENCCC_PATH "libvmaf.dll" ).arg(sysinfo->getAppPath(), arch); | |
| 228 | + dependencies << QString(NVENCCC_PATH "nvrtc64_101_0.dll" ).arg(sysinfo->getAppPath(), arch); | |
| 229 | + dependencies << QString(NVENCCC_PATH "nvrtc-builtins64_101.dll").arg(sysinfo->getAppPath(), arch); | |
| 230 | + } | |
| 231 | + return dependencies; | |
| 222 | 232 | } |
| 223 | 233 | |
| 224 | 234 | virtual QString getHelpCommand(void) const |
Simple x264/x265 Launcher
Fork