#124 change compute_vmaf() interface to return an error code instead …

…of throw an error. (#126)

README.md

@@ -489,7 +489,7 @@ make install
 This copies the library header `libvmaf.h` under `usr/local/include`, library `libvmaf.a `under `user/local/lib` and all the model files under `usr/local/share`. You can use the header `libvmaf.h` in your program. It contains an API which can be called from any C/C++ program:
 
 ```
-double compute_vmaf(char* fmt, int width, int height, int (*read_frame)(float *ref_data, float *main_data, float *temp_data,
+int compute_vmaf(double* vmaf_score, char* fmt, int width, int height, int (*read_frame)(float *ref_data, float *main_data, float *temp_data,
 int stride, void *user_data), void *user_data, char *model_path, char *log_path, char *log_fmt, int disable_clip,
 int disable_avx, int enable_transform, int phone_model, int do_psnr, int do_ssim, int do_ms_ssim, char *pool_method);
 ```

wrapper/src/libvmaf.cpp

@@ -25,7 +25,7 @@ extern "C" {
 
 enum vmaf_cpu cpu; // global
 
-double compute_vmaf(char* fmt, int width, int height, int (*read_frame)(float *ref_data, float *main_data, float *temp_data, int stride_byte, void *user_data),  void *user_data, char *model_path, char *log_path, char *log_fmt, int disable_clip, int disable_avx, int enable_transform, int phone_model, int do_psnr, int do_ssim, int do_ms_ssim, char *pool_method)
+int compute_vmaf(double* vmaf_score, char* fmt, int width, int height, int (*read_frame)(float *ref_data, float *main_data, float *temp_data, int stride_byte, void *user_data),  void *user_data, char *model_path, char *log_path, char *log_fmt, int disable_clip, int disable_avx, int enable_transform, int phone_model, int do_psnr, int do_ssim, int do_ms_ssim, char *pool_method)
 	{
 		bool d_c = false;
 		bool d_a = false;
@@ -60,10 +60,21 @@ double compute_vmaf(char* fmt, int width, int height, int (*read_frame)(float *r
             cpu = VMAF_CPU_NONE;
         }
 
-		double score = RunVmaf(fmt, width, height, read_frame, user_data, model_path, log_path, log_fmt, d_c, e_t, d_p, d_s, d_m_s, pool_method);
-
-		return score;
-
-	}
+        try {
+            double score = RunVmaf(fmt, width, height, read_frame, user_data, model_path, log_path, log_fmt, d_c, e_t, d_p, d_s, d_m_s, pool_method);
+            *vmaf_score = score;
+            return 0;
+        }
+        catch (VmafException& e)
+        {
+            printf("Caught VmafException: %s\n", e.what());
+            return 1;
+        }
+        catch (std::runtime_error& e)
+        {
+            printf("Caught runtime_error: %s\n", e.what());
+            return 1;
+        }
+    }
 
 }

wrapper/src/libvmaf.h

@@ -23,7 +23,7 @@
 extern "C" {
 #endif
 
-double compute_vmaf(char* fmt, int width, int height, int (*read_frame)(float *ref_data, float *main_data, float *temp_data, int stride_byte, void *user_data), void *user_data, char *model_path, char *log_path, char *log_fmt, int disable_clip, int disable_avx, int enable_transform, int phone_model, int do_psnr, int do_ssim, int do_ms_ssim, char *pool_method);
+int compute_vmaf(double* vmaf_score, char* fmt, int width, int height, int (*read_frame)(float *ref_data, float *main_data, float *temp_data, int stride_byte, void *user_data), void *user_data, char *model_path, char *log_path, char *log_fmt, int disable_clip, int disable_avx, int enable_transform, int phone_model, int do_psnr, int do_ssim, int do_ms_ssim, char *pool_method);
 
 
 #ifdef __cplusplus

wrapper/src/main.cpp

@@ -106,7 +106,7 @@ int run_wrapper(char *fmt, int width, int height, char *ref_path, char *dis_path
     }
 
     /* Run VMAF */
-    score = compute_vmaf(fmt, width, height, read_frame, s, model_path, log_path, log_fmt, disable_clip, disable_avx, enable_transform, phone_model, do_psnr, do_ssim, do_ms_ssim, pool_method);
+    ret = compute_vmaf(&score, fmt, width, height, read_frame, s, model_path, log_path, log_fmt, disable_clip, disable_avx, enable_transform, phone_model, do_psnr, do_ssim, do_ms_ssim, pool_method);
 
 fail_or_end:
     if (s->ref_rfile)