commit 77079e84399d45fea50708ed391192f894fbfe30
author sdeng <sdeng@google.com> Mon Jan 06 11:15:49 2020 -0800
committer Sai Deng <sdeng@google.com> Tue Jan 07 00:53:15 2020 +0000
tree 6ba7f70967e1395a81829a317e6bf816376c66a4
parent 0195916922b4f7f5945f6cdd5a020827e766ec57

Exit program when VMAF calculation failed

Change-Id: I28fa21ce491af4a88c807c61e7f0b452de9eb5fb

aom_dsp/vmaf.c

diff --git a/aom_dsp/vmaf.c b/aom_dsp/vmaf.c
index 860fa70..ea453fa 100644
--- a/aom_dsp/vmaf.c
+++ b/aom_dsp/vmaf.c
@@ -11,8 +11,10 @@
 #include <assert.h>
 #include <libvmaf/libvmaf.h>
 #include <stdlib.h>
+
 #include "aom_dsp/vmaf.h"
 #include "aom_ports/system_state.h"
+#include "common/tools_common.h"
 
 typedef struct FrameData {
   const YV12_BUFFER_CONFIG *source;
@@ -58,8 +60,8 @@
   return 2;
 }
 
-int aom_calc_vmaf(const char *model_path, const YV12_BUFFER_CONFIG *source,
-                  const YV12_BUFFER_CONFIG *distorted, double *vmaf) {
+void aom_calc_vmaf(const char *model_path, const YV12_BUFFER_CONFIG *source,
+                   const YV12_BUFFER_CONFIG *distorted, double *vmaf) {
   aom_clear_system_state();
   const int width = source->y_width;
   const int height = source->y_height;
@@ -79,5 +81,5 @@
 
   aom_clear_system_state();
   *vmaf = vmaf_score;
-  return ret;
+  if (ret) fatal("Failed to compute VMAF scores.");
 }

aom_dsp/vmaf.h

diff --git a/aom_dsp/vmaf.h b/aom_dsp/vmaf.h
index 8a9e56c..b96bb44 100644
--- a/aom_dsp/vmaf.h
+++ b/aom_dsp/vmaf.h
@@ -14,7 +14,7 @@
 
 #include "aom_scale/yv12config.h"
 
-int aom_calc_vmaf(const char *model_path, const YV12_BUFFER_CONFIG *source,
-                  const YV12_BUFFER_CONFIG *distorted, double *vmaf);
+void aom_calc_vmaf(const char *model_path, const YV12_BUFFER_CONFIG *source,
+                   const YV12_BUFFER_CONFIG *distorted, double *vmaf);
 
 #endif  // AOM_AOM_DSP_VMAF_H_