Merge pull request #326 from legrosbuffle/master

A few compilation fixes (warnings and errors).
Netflix · Jul 15, 2019 · d8642b2 · d8642b2
2 parents c6ea2de + acec4a4
commit d8642b2
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 14 deletions.
diff --git a/feature/src/adm.c b/feature/src/adm.c
@@ -83,7 +83,6 @@ int compute_adm(const float *ref, const float *dis, int w, int h, int ref_stride
 	adm_dwt_band_t decouple_r;
 	adm_dwt_band_t decouple_a;
 
-	adm_dwt_band_t csf_r;
 	adm_dwt_band_t csf_a;
 	adm_dwt_band_t csf_f; //Store filtered coeffs
 

diff --git a/feature/src/common/convolution.c b/feature/src/common/convolution.c
@@ -17,7 +17,6 @@
  */
 
 #include "alignment.h"
-#include "vif_options.h"
 #include "convolution.h"
 #include "convolution_internal.h"
 #include "cpu.h"

diff --git a/feature/src/common/convolution_avx.c b/feature/src/common/convolution_avx.c
@@ -18,7 +18,6 @@
 
 #include <immintrin.h>
 #include "alignment.h"
-#include "vif_options.h"
 #include "convolution.h"
 #include "convolution_internal.h"
 

diff --git a/feature/src/common/file_io.c b/feature/src/common/file_io.c
@@ -23,7 +23,7 @@
 /**
  * Note: stride is in terms of bytes
  */
-float apply_frame_differencing(const float *current_frame, const float *previous_frame, float *frame_difference, int width, int height, int stride)
+void apply_frame_differencing(const float *current_frame, const float *previous_frame, float *frame_difference, int width, int height, int stride)
 {
     for (int i = 0; i < height; ++i) {
         for (int j = 0; j < width; ++j) {

diff --git a/feature/src/common/file_io.h b/feature/src/common/file_io.h
@@ -25,7 +25,7 @@
 //#define OPT_RANGE_PIXEL_OFFSET 0
 #define OPT_RANGE_PIXEL_OFFSET (-128)
 
-float apply_frame_differencing(const float *current_frame, const float *previous_frame, float *frame_difference, int width, int height, int stride);
+void apply_frame_differencing(const float *current_frame, const float *previous_frame, float *frame_difference, int width, int height, int stride);
 int read_image(FILE *rfile, void *buf, int width, int height, int stride, int elem_size);
 int write_image(FILE *wfile, const void *buf, int width, int height, int stride, int elem_size);
 

diff --git a/feature/src/vif.c b/feature/src/vif.c
@@ -24,10 +24,9 @@
 #include <string.h>
 
 #include "common/alloc.h"
+#include "common/convolution.h"
 #include "common/file_io.h"
 #include "vif_options.h"
-#include "convolution.h"
-#include "convolution_internal.h"
 #include "vif_tools.h"
 
 #define read_image_b       read_image_b2s

diff --git a/feature/src/vif_tools.c b/feature/src/vif_tools.c
@@ -22,9 +22,8 @@
 #include <stdint.h>
 #include <string.h>
 #include "common/alloc.h"
+#include "common/convolution.h"
 #include "vif_options.h"
-#include "convolution.h"
-#include "convolution_internal.h"
 #include "vif_tools.h"
 #include "common/cpu.h"
 
@@ -221,12 +220,9 @@ void vif_statistic_s(const float *mu1, const float *mu2, const float *mu1_mu2, c
 
 	int mu1_px_stride = mu1_stride / sizeof(float);
 	int mu2_px_stride = mu2_stride / sizeof(float);
-	int mu1_mu2_px_stride = mu1_mu2_stride / sizeof(float);
 	int xx_filt_px_stride = xx_filt_stride / sizeof(float);
 	int yy_filt_px_stride = yy_filt_stride / sizeof(float);
 	int xy_filt_px_stride = xy_filt_stride / sizeof(float);
-	int num_px_stride = num_stride / sizeof(float);
-	int den_px_stride = den_stride / sizeof(float);
 
 	float mu1_sq_val, mu2_sq_val, mu1_mu2_val, xx_filt_val, yy_filt_val, xy_filt_val;
 	float sigma1_sq, sigma2_sq, sigma12, g, sv_sq;

diff --git a/wrapper/src/combo.h b/wrapper/src/combo.h
@@ -75,11 +75,11 @@ typedef struct
     int thread_count;
     int stop_threads;
     pthread_mutex_t mutex_readframe;
+#endif
     BLUR_BUF_ARRAY blur_buf_array;
     BLUR_BUF_ARRAY ref_buf_array;
     BLUR_BUF_ARRAY dis_buf_array;
-	DArray *motion_score_compute_flag_array;
-#endif
+    DArray *motion_score_compute_flag_array;
     int ret;
 
 } VMAF_THREAD_STRUCT;