• R/O
  • HTTP
  • SSH
  • HTTPS

x264-launcher: Commit

Simple x264 Launcher development repository


Commit MetaInfo

Revisionfc49f8a14a3e9e5196cb8b955970b3198002a8ba (tree)
Time2022-06-16 23:19:46
Authorlordmulder <mulder2@gmx....>
Commiterlordmulder

Log Message

Bump NVEncC binaries to version 6.05 + updated detection NVEncC of dependencies.

Change Summary

Incremental Difference

--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -5,6 +5,7 @@ Simple x264/x265 Launcher version history
55 Version 3.02 [2021-06-16]
66 * Updated x264 to revision 3094 (API v164)
77 * Updated x265 to version 3.5+37
8+* Updated NVEncC to version 6.05
89 * Updated build environment to Visual Studio 2022 with Update-2
910
1011 Version 3.01 [2021-12-08]
--- a/src/encoder_nvencc.cpp
+++ b/src/encoder_nvencc.cpp
@@ -40,7 +40,7 @@
4040 #include <QPair>
4141
4242 //x265 version info
43-static const unsigned int VERSION_NVENCC_MINIMUM_VER = 541;
43+static const unsigned int VERSION_NVENCC_MINIMUM_VER = 605;
4444
4545 // ------------------------------------------------------------
4646 // Helper Macros
@@ -108,6 +108,8 @@ while(0)
108108 // Encoder Info
109109 // ------------------------------------------------------------
110110
111+#define NVENCCC_PATH "%1/toolset/%2/nvencc/"
112+
111113 class NVEncEncoderInfo : public AbstractEncoderInfo
112114 {
113115 public:
@@ -213,12 +215,20 @@ public:
213215 default: MUTILS_THROW("Unknown encoder variant!");
214216
215217 }
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;
222232 }
223233
224234 virtual QString getHelpCommand(void) const
Show on old repository browser