Set libvmaf's threads according to core's threads

HomeOfVapourSynthEvolution · Feb 1, 2019 · 4c6d972 · 4c6d972
1 parent 37f66a7
commit 4c6d972
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -49,4 +49,5 @@ Requires `libvmaf`.
 ```
 meson build
 ninja -C build
+ninja -C build install
 ```
diff --git a/VMAF/VMAF.cpp b/VMAF/VMAF.cpp
@@ -43,10 +43,10 @@ struct VMAFData {
     char * fmt, * logFmt, * pool;
     std::unique_ptr<char[]> modelPath, logPath;
     bool psnr, ssim, ms_ssim, ci, frameSet, eof;
+    int numThreads, error;
     std::thread vmafThread;
     std::mutex mtx;
     std::condition_variable cond;
-    int error;
 };
 
 template<typename T>
@@ -94,9 +94,9 @@ static int readFrame(float * VS_RESTRICT refData, float * VS_RESTRICT mainData,
 
 static void callVMAF(VMAFData * const VS_RESTRICT d) noexcept {
     if (d->vi->format->bytesPerSample == 1)
-        d->error = compute_vmaf(&d->vmafScore, d->fmt, d->vi->width, d->vi->height, readFrame<uint8_t>, d, d->modelPath.get(), d->logPath.get(), d->logFmt, 0, 0, 0, 0, d->psnr, d->ssim, d->ms_ssim, d->pool, 0, 1, d->ci);
+        d->error = compute_vmaf(&d->vmafScore, d->fmt, d->vi->width, d->vi->height, readFrame<uint8_t>, d, d->modelPath.get(), d->logPath.get(), d->logFmt, 0, 0, 0, 0, d->psnr, d->ssim, d->ms_ssim, d->pool, d->numThreads, 1, d->ci);
     else
-        d->error = compute_vmaf(&d->vmafScore, d->fmt, d->vi->width, d->vi->height, readFrame<uint16_t>, d, d->modelPath.get(), d->logPath.get(), d->logFmt, 0, 0, 0, 0, d->psnr, d->ssim, d->ms_ssim, d->pool, 0, 1, d->ci);
+        d->error = compute_vmaf(&d->vmafScore, d->fmt, d->vi->width, d->vi->height, readFrame<uint16_t>, d, d->modelPath.get(), d->logPath.get(), d->logFmt, 0, 0, 0, 0, d->psnr, d->ssim, d->ms_ssim, d->pool, d->numThreads, 1, d->ci);
 
     if (d->error) {
         d->mtx.lock();
@@ -122,7 +122,7 @@ static const VSFrameRef *VS_CC vmafGetFrame(int n, int activationReason, void **
             d->cond.wait(lck);
 
         if (d->error) {
-            vsapi->setFilterError(std::string{ "VMAF: libvmaf error" }.c_str(), frameCtx);
+            vsapi->setFilterError("VMAF: libvmaf error", frameCtx);
             return nullptr;
         }
 
@@ -244,6 +244,8 @@ static void VS_CC vmafCreate(const VSMap *in, VSMap *out, void *userData, VSCore
         else
             d->pool = const_cast<char *>("min");
 
+        d->numThreads = vsapi->getCoreInfo(core)->numThreads;
+
         d->vmafThread = std::thread{ callVMAF, d.get() };
     } catch (const std::string & error) {
         vsapi->setError(out, ("VMAF: " + error).c_str());

diff --git a/VMAF/VMAF.vcxproj b/VMAF/VMAF.vcxproj
@@ -41,15 +41,14 @@
       <WarningLevel>Level3</WarningLevel>
       <DiagnosticsFormat>Column</DiagnosticsFormat>
       <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
       <ConformanceMode>true</ConformanceMode>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>libpthread-static.lib;libvmaf.lib;ptools.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libvmaf.lib;pthreads.lib;ptools.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 project('VMAF', 'cpp',
   default_options : ['buildtype=release', 'b_ndebug=if-release', 'cpp_std=c++14'],
   meson_version : '>=0.48.0',
-  version : '2'
+  version : '3'
 )
 
 add_project_arguments('-ffast-math', language : 'cpp')