From e70e9cc6dba2ad42dca52e8a8582f9c074cdb1f7 Mon Sep 17 00:00:00 2001 From: ymherklotz Date: Thu, 22 Mar 2018 20:20:59 +0000 Subject: Adding wav files --- Project/RTDSP/.launches/RTDSP.launch | 6 +++--- Project/RTDSP/Matlab/create_spectrogram.m | 2 +- Project/RTDSP/audio/best_case/car.wav | Bin 3145806 -> 374536 bytes Project/RTDSP/audio/best_case/car.wma | Bin 229479 -> 0 bytes Project/RTDSP/audio/best_case/factory2.wav | Bin 0 -> 393484 bytes Project/RTDSP/audio/best_case/lynx2.wav | Bin 4251726 -> 386796 bytes Project/RTDSP/audio/best_case/lynx2.wma | Bin 310299 -> 0 bytes Project/RTDSP/audio/best_case/phantom2.wav | Bin 4251726 -> 379364 bytes Project/RTDSP/audio/best_case/phantom2.wma | Bin 305809 -> 0 bytes Project/RTDSP/audio/best_case/phantom4.wav | Bin 3629134 -> 419860 bytes Project/RTDSP/audio/best_case/phantom4.wma | Bin 265399 -> 0 bytes Project/RTDSP/enhance.c | 8 ++++---- 12 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 Project/RTDSP/audio/best_case/car.wma create mode 100644 Project/RTDSP/audio/best_case/factory2.wav delete mode 100644 Project/RTDSP/audio/best_case/lynx2.wma delete mode 100644 Project/RTDSP/audio/best_case/phantom2.wma delete mode 100644 Project/RTDSP/audio/best_case/phantom4.wma (limited to 'Project/RTDSP') diff --git a/Project/RTDSP/.launches/RTDSP.launch b/Project/RTDSP/.launches/RTDSP.launch index a20d05f..81f81c8 100644 --- a/Project/RTDSP/.launches/RTDSP.launch +++ b/Project/RTDSP/.launches/RTDSP.launch @@ -12,8 +12,8 @@ - - + + @@ -21,6 +21,6 @@ - + diff --git a/Project/RTDSP/Matlab/create_spectrogram.m b/Project/RTDSP/Matlab/create_spectrogram.m index 41c0f94..44acee2 100644 --- a/Project/RTDSP/Matlab/create_spectrogram.m +++ b/Project/RTDSP/Matlab/create_spectrogram.m @@ -1,7 +1,7 @@ %% % Creates the spectrogram for the audio files -[song, fs] = audioread('../audio/phatom4_best.wav'); +[song, fs] = audioread('../audio/best_case/phantom4.wav'); song = song(1:fs*10); figure spectrogram(song, 256, [], [], fs, 'yaxis'); diff --git a/Project/RTDSP/audio/best_case/car.wav b/Project/RTDSP/audio/best_case/car.wav index 7b3a194..1fadc58 100644 Binary files a/Project/RTDSP/audio/best_case/car.wav and b/Project/RTDSP/audio/best_case/car.wav differ diff --git a/Project/RTDSP/audio/best_case/car.wma b/Project/RTDSP/audio/best_case/car.wma deleted file mode 100644 index 30c3302..0000000 Binary files a/Project/RTDSP/audio/best_case/car.wma and /dev/null differ diff --git a/Project/RTDSP/audio/best_case/factory2.wav b/Project/RTDSP/audio/best_case/factory2.wav new file mode 100644 index 0000000..18360c4 Binary files /dev/null and b/Project/RTDSP/audio/best_case/factory2.wav differ diff --git a/Project/RTDSP/audio/best_case/lynx2.wav b/Project/RTDSP/audio/best_case/lynx2.wav index 3cb2341..fc7f065 100644 Binary files a/Project/RTDSP/audio/best_case/lynx2.wav and b/Project/RTDSP/audio/best_case/lynx2.wav differ diff --git a/Project/RTDSP/audio/best_case/lynx2.wma b/Project/RTDSP/audio/best_case/lynx2.wma deleted file mode 100644 index 1966d2d..0000000 Binary files a/Project/RTDSP/audio/best_case/lynx2.wma and /dev/null differ diff --git a/Project/RTDSP/audio/best_case/phantom2.wav b/Project/RTDSP/audio/best_case/phantom2.wav index 048155c..1aba321 100644 Binary files a/Project/RTDSP/audio/best_case/phantom2.wav and b/Project/RTDSP/audio/best_case/phantom2.wav differ diff --git a/Project/RTDSP/audio/best_case/phantom2.wma b/Project/RTDSP/audio/best_case/phantom2.wma deleted file mode 100644 index 733c5e2..0000000 Binary files a/Project/RTDSP/audio/best_case/phantom2.wma and /dev/null differ diff --git a/Project/RTDSP/audio/best_case/phantom4.wav b/Project/RTDSP/audio/best_case/phantom4.wav index ab52539..571a51e 100644 Binary files a/Project/RTDSP/audio/best_case/phantom4.wav and b/Project/RTDSP/audio/best_case/phantom4.wav differ diff --git a/Project/RTDSP/audio/best_case/phantom4.wma b/Project/RTDSP/audio/best_case/phantom4.wma deleted file mode 100644 index 5a7aa75..0000000 Binary files a/Project/RTDSP/audio/best_case/phantom4.wma and /dev/null differ diff --git a/Project/RTDSP/enhance.c b/Project/RTDSP/enhance.c index 16ceac2..f244925 100644 --- a/Project/RTDSP/enhance.c +++ b/Project/RTDSP/enhance.c @@ -49,12 +49,12 @@ #define OVERSAMP 4 /* oversampling ratio (2 or 4) */ #define FRAMEINC (FFTLEN/OVERSAMP) /* Frame increment */ #define CIRCBUF (FFTLEN+FRAMEINC) /* length of I/O buffers */ -#define FRAME_TIME 2.5 -#define MAX_COUNT 20000 +#define FRAME_TIME 1 +#define MAX_COUNT (FRAME_TIME * FSAMP) #define MAX_FLOAT 3.4E+38 #define OUTGAIN 16000.0 /* Output gain for DAC */ #define INGAIN (1.0/16000.0) /* Input gain for ADC */ -#define NUM_M 4 +#define NUM_M 2 #define NUM_ALPHA 4 // PI defined here for use in your code #define PI 3.141592653589793 @@ -103,7 +103,7 @@ volatile int m_ptr = 0; float snr_val = 0; float total_snr = 0; float lambda = 0.05; -float alpha[NUM_ALPHA] = {100, 50, 20, 5}; +float alpha[NUM_ALPHA] = {100, 100, 50, 10}; float avg = 0; float sum = 0; float *M[NUM_M]; -- cgit