changeset 12674:b0b0553471a5 Release_3.4

Fix libvmaf integration issues 1. Updates the search path of libvmaf.h 2. Fix incorrect argument in vmaf_encoder_log() API
author Aruna <aruna@multicorewareinc.com>
date Tue, 07 Jul 2020 04:41:38 +0530
parents 7b120308dc64
children 2d287c472f05
files source/abrEncApp.cpp source/encoder/api.cpp
diffstat 2 files changed, 2 insertions(+-), 2 deletions(-) [+]
line wrap: on
line diff
--- a/source/abrEncApp.cpp	Fri May 29 23:15:38 2020 +0530
+++ b/source/abrEncApp.cpp	Tue Jul 07 04:41:38 2020 +0530
@@ -814,7 +814,7 @@ ret:
             api->encoder_get_stats(m_encoder, &stats, sizeof(stats));
             if (m_param->csvfn && !b_ctrl_c)
 #if ENABLE_LIBVMAF
-                api->vmaf_encoder_log(m_encoder, m_cliopt.argCount, m_cliopt.argString, m_cliopt.param, vmafdata);
+                api->vmaf_encoder_log(m_encoder, m_cliopt.argCnt, m_cliopt.argString, m_cliopt.param, vmafdata);
 #else
                 api->encoder_log(m_encoder, m_cliopt.argCnt, m_cliopt.argString);
 #endif
--- a/source/encoder/api.cpp	Fri May 29 23:15:38 2020 +0530
+++ b/source/encoder/api.cpp	Tue Jul 07 04:41:38 2020 +0530
@@ -33,7 +33,7 @@
 #include "svt.h"
 
 #if ENABLE_LIBVMAF
-#include "libvmaf.h"
+#include "libvmaf/libvmaf.h"
 #endif
 
 /* multilib namespace reflectors */