Minor optimization

HomeOfVapourSynthEvolution · Oct 12, 2019 · f1b7159 · f1b7159
1 parent c04f275
commit f1b7159
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/VMAF/VMAF.cpp b/VMAF/VMAF.cpp
@@ -29,6 +29,7 @@
 #include <mutex>
 #include <string>
 #include <thread>
+#include <type_traits>
 
 #include <VapourSynth.h>
 #include <VSHelper.h>
@@ -69,8 +70,13 @@ static int readFrame(float * VS_RESTRICT refData, float * VS_RESTRICT mainData,
 
         for (int y = 0; y < height; y++) {
             for (int x = 0; x < width; x++) {
-                refData[x] = refp[x] / d->divisor;
-                mainData[x] = mainp[x] / d->divisor;
+                if constexpr (std::is_same_v<T, uint8_t>) {
+                    refData[x] = refp[x];
+                    mainData[x] = mainp[x];
+                } else {
+                    refData[x] = refp[x] * d->divisor;
+                    mainData[x] = mainp[x] * d->divisor;
+                }
             }
 
             refp += srcStride;
@@ -237,7 +243,7 @@ static void VS_CC vmafCreate(const VSMap * in, VSMap * out, void * userData, VSC
 
         d->numThreads = vsapi->getCoreInfo(core)->numThreads;
 
-        d->divisor = 1 << (d->vi->format->bitsPerSample - 8);
+        d->divisor = 1.0f / (1 << (d->vi->format->bitsPerSample - 8));
 
         d->vmafThread = std::thread{ callVMAF, d.get() };
     } catch (const std::string & error) {

diff --git a/VMAF/VMAF.vcxproj b/VMAF/VMAF.vcxproj
@@ -40,6 +40,7 @@
       <WarningLevel>Level3</WarningLevel>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

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'],
+  default_options : ['buildtype=release', 'b_ndebug=if-release', 'cpp_std=c++17'],
   meson_version : '>=0.48.0',
-  version : '5'
+  version : '6'
 )
 
 add_project_arguments('-ffast-math', language : 'cpp')