From 72e3330a023409b24b5b22e87e72a4c2f7275b1b Mon Sep 17 00:00:00 2001 From: Jan Buethe Date: Fri, 24 Nov 2023 16:28:55 +0100 Subject: [PATCH] added some const qualifiers --- dnn/adaconvtest.c | 2 +- dnn/nndsp.c | 23 ++++++++++++----------- dnn/nndsp.h | 23 ++++++++++++----------- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dnn/adaconvtest.c b/dnn/adaconvtest.c index d7965d8df..e02d539b8 100644 --- a/dnn/adaconvtest.c +++ b/dnn/adaconvtest.c @@ -207,7 +207,7 @@ void adacomb_compare( } adacomb_process_frame(hAdaComb, x_out, x_in, features, kernel_layer, gain_layer, global_gain_layer, - pitch_lag, frame_size, overlap_size, kernel_size, left_padding, filter_gain_a, filter_gain_b, log_gain_limit, NULL); + pitch_lag, feature_dim, frame_size, overlap_size, kernel_size, left_padding, filter_gain_a, filter_gain_b, log_gain_limit, NULL); mse = 0; diff --git a/dnn/nndsp.c b/dnn/nndsp.c index 6283ff847..265ae6cab 100644 --- a/dnn/nndsp.c +++ b/dnn/nndsp.c @@ -19,7 +19,7 @@ void init_adacomb_state(AdaCombState *hAdaComb) } #ifdef DEBUG_NNDSP -void print_float_vector(const char* name, float *vec, int length) +void print_float_vector(const char* name, const float *vec, int length) { for (int i = 0; i < length; i ++) { @@ -83,11 +83,11 @@ static void transform_gains( void adaconv_process_frame( AdaConvState* hAdaConv, float *x_out, - float *x_in, - float *features, - LinearLayer *kernel_layer, - LinearLayer *gain_layer, - int feature_dim, // not strictly necessary + const float *x_in, + const float *features, + const LinearLayer *kernel_layer, + const LinearLayer *gain_layer, + int feature_dim, int frame_size, int overlap_size, int in_channels, @@ -198,12 +198,13 @@ void adaconv_process_frame( void adacomb_process_frame( AdaCombState* hAdaComb, float *x_out, - float *x_in, - float *features, - LinearLayer *kernel_layer, - LinearLayer *gain_layer, - LinearLayer *global_gain_layer, + const float *x_in, + const float *features, + const LinearLayer *kernel_layer, + const LinearLayer *gain_layer, + const LinearLayer *global_gain_layer, int pitch_lag, + int feature_dim, int frame_size, int overlap_size, int kernel_size, diff --git a/dnn/nndsp.h b/dnn/nndsp.h index 9d7c3b2ed..6846a101d 100644 --- a/dnn/nndsp.h +++ b/dnn/nndsp.h @@ -17,12 +17,12 @@ #define ADACOMB_MAX_FRAME_SIZE 80 #define ADACOMB_MAX_OVERLAP_SIZE 40 -// #define DEBUG_NNDSP +//#define DEBUG_NNDSP #ifdef DEBUG_NNDSP #include #endif -void print_float_vector(const char* name, float *vec, int length); +void print_float_vector(const char* name, const float *vec, int length); typedef struct { float history[ADACONV_MAX_KERNEL_SIZE * ADACONV_MAX_INPUT_CHANNELS]; @@ -46,10 +46,10 @@ void init_adacomb_state(AdaCombState *hAdaComb); void adaconv_process_frame( AdaConvState* hAdaConv, float *x_out, - float *x_in, - float *features, - LinearLayer *kernel_layer, - LinearLayer *gain_layer, + const float *x_in, + const float *features, + const LinearLayer *kernel_layer, + const LinearLayer *gain_layer, int feature_dim, // not strictly necessary int frame_size, int overlap_size, @@ -66,12 +66,13 @@ void adaconv_process_frame( void adacomb_process_frame( AdaCombState* hAdaComb, float *x_out, - float *x_in, - float *features, - LinearLayer *kernel_layer, - LinearLayer *gain_layer, - LinearLayer *global_gain_layer, + const float *x_in, + const float *features, + const LinearLayer *kernel_layer, + const LinearLayer *gain_layer, + const LinearLayer *global_gain_layer, int pitch_lag, + int feature_dim, int frame_size, int overlap_size, int kernel_size,