aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorymherklotz <ymherklotz@gmail.com>2018-03-22 20:20:59 +0000
committerymherklotz <ymherklotz@gmail.com>2018-03-22 20:20:59 +0000
commite70e9cc6dba2ad42dca52e8a8582f9c074cdb1f7 (patch)
tree171a5abd8183a5a287b489ebe0126658c6b3c512
parent6fb44833cceb12509fcc7c971fdff4aa66c7efaa (diff)
downloadNoiseSilencer-e70e9cc6dba2ad42dca52e8a8582f9c074cdb1f7.tar.gz
NoiseSilencer-e70e9cc6dba2ad42dca52e8a8582f9c074cdb1f7.zip
Adding wav files
-rw-r--r--Project/RTDSP/.launches/RTDSP.launch6
-rw-r--r--Project/RTDSP/Matlab/create_spectrogram.m2
-rw-r--r--Project/RTDSP/audio/best_case/car.wavbin3145806 -> 374536 bytes
-rw-r--r--Project/RTDSP/audio/best_case/car.wmabin229479 -> 0 bytes
-rw-r--r--Project/RTDSP/audio/best_case/factory2.wavbin0 -> 393484 bytes
-rw-r--r--Project/RTDSP/audio/best_case/lynx2.wavbin4251726 -> 386796 bytes
-rw-r--r--Project/RTDSP/audio/best_case/lynx2.wmabin310299 -> 0 bytes
-rw-r--r--Project/RTDSP/audio/best_case/phantom2.wavbin4251726 -> 379364 bytes
-rw-r--r--Project/RTDSP/audio/best_case/phantom2.wmabin305809 -> 0 bytes
-rw-r--r--Project/RTDSP/audio/best_case/phantom4.wavbin3629134 -> 419860 bytes
-rw-r--r--Project/RTDSP/audio/best_case/phantom4.wmabin265399 -> 0 bytes
-rw-r--r--Project/RTDSP/enhance.c8
12 files changed, 8 insertions, 8 deletions
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 @@
<stringAttribute key="com.ti.ccstudio.debug.core.DISPLAY_NAME_FORMAT" value="RTDSP [Debug] - {0}"/>
<stringAttribute key="CCEDebugOptions.TARGET_CONFIGURATION_OPTION" value="full"/>
<stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList/&gt;&#13;&#10;"/>
-<stringAttribute key="com.ti.ccstudio.debug.core.MRU_PROGRAM_NAME" value="C:\GIT\RTDSP\Project\RTDSP\Debug\RTDSP.out"/>
-<stringAttribute key="com.ti.ccstudio.debug.core.MRU_MODULES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;modules&gt;&#13;&#10;&lt;module name=&quot;C:\GIT\RTDSP\lab3\RTDSP\Debug\RTDSP.out&quot; time=&quot;Fri Jan 19 14:07:28 GMT 2018&quot; time_long=&quot;1516370848357&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\Github\RTDSP\lab3\RTDSP\Debug\RTDSP.out&quot; time=&quot;Tue Jan 23 11:15:11 GMT 2018&quot; time_long=&quot;1516706111426&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\GIT\RTDSP\lab4\RTDSP\Debug\RTDSP.out&quot; time=&quot;Thu Feb 01 11:44:21 GMT 2018&quot; time_long=&quot;1517485461898&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\github\RTDSP\lab4\RTDSP\Debug\RTDSP.out&quot; time=&quot;Thu Feb 15 13:55:55 GMT 2018&quot; time_long=&quot;1518702955359&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\Github\RTDSP\lab5\RTDSP\Debug\RTDSP.out&quot; time=&quot;Tue Feb 27 12:18:55 GMT 2018&quot; time_long=&quot;1519733935329&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\github\RTDSP\lab5\RTDSP\Debug\RTDSP.out&quot; time=&quot;Thu Mar 01 13:36:20 GMT 2018&quot; time_long=&quot;1519911380476&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\github\RTDSP\Project\RTDSP\Debug\RTDSP.out&quot; time=&quot;Mon Mar 19 17:15:31 GMT 2018&quot; time_long=&quot;1521479731757&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\GIT\RTDSP\Project\RTDSP\Debug\RTDSP.out&quot; time=&quot;Tue Mar 20 19:51:04 GMT 2018&quot; time_long=&quot;1521575464043&quot;/&gt;&#13;&#10;&lt;/modules&gt;&#13;&#10;"/>
+<stringAttribute key="com.ti.ccstudio.debug.core.MRU_PROGRAM_NAME" value="C:\github\RTDSP\Project\RTDSP\Debug\RTDSP.out"/>
+<stringAttribute key="com.ti.ccstudio.debug.core.MRU_MODULES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;modules&gt;&#13;&#10;&lt;module name=&quot;C:\GIT\RTDSP\lab3\RTDSP\Debug\RTDSP.out&quot; time=&quot;Fri Jan 19 14:07:28 GMT 2018&quot; time_long=&quot;1516370848357&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\Github\RTDSP\lab3\RTDSP\Debug\RTDSP.out&quot; time=&quot;Tue Jan 23 11:15:11 GMT 2018&quot; time_long=&quot;1516706111426&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\GIT\RTDSP\lab4\RTDSP\Debug\RTDSP.out&quot; time=&quot;Thu Feb 01 11:44:21 GMT 2018&quot; time_long=&quot;1517485461898&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\github\RTDSP\lab4\RTDSP\Debug\RTDSP.out&quot; time=&quot;Thu Feb 15 13:55:55 GMT 2018&quot; time_long=&quot;1518702955359&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\Github\RTDSP\lab5\RTDSP\Debug\RTDSP.out&quot; time=&quot;Tue Feb 27 12:18:55 GMT 2018&quot; time_long=&quot;1519733935329&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\github\RTDSP\lab5\RTDSP\Debug\RTDSP.out&quot; time=&quot;Thu Mar 01 13:36:20 GMT 2018&quot; time_long=&quot;1519911380476&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\GIT\RTDSP\Project\RTDSP\Debug\RTDSP.out&quot; time=&quot;Tue Mar 20 19:51:04 GMT 2018&quot; time_long=&quot;1521575464043&quot;/&gt;&#13;&#10;&lt;module name=&quot;C:\github\RTDSP\Project\RTDSP\Debug\RTDSP.out&quot; time=&quot;Thu Mar 22 18:51:06 GMT 2018&quot; time_long=&quot;1521744666330&quot;/&gt;&#13;&#10;&lt;/modules&gt;&#13;&#10;"/>
<stringAttribute key="CCEDebugOptions.CPU_NAME" value="Spectrum Digital DSK-EVM-eZdsp onboard USB Emulator_0/TMS320C671X"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="RTDSP"/>
<stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;globalVariableList/&gt;&#13;&#10;"/>
@@ -21,6 +21,6 @@
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug/RTDSP.out"/>
<stringAttribute key="CCEDebugOptions.CPU_ISA" value="TMS320C671X"/>
<stringAttribute key="com.ti.ccstudio.debug.core.BUILD_CONFIGURATION" value="Debug"/>
-<stringAttribute key="CCEDebugOptions.TARGET_CONFIGURATION_FILE" value="C:\GIT\RTDSP\Project\RTDSP\NewTargetConfiguration.ccxml"/>
+<stringAttribute key="CCEDebugOptions.TARGET_CONFIGURATION_FILE" value="C:\github\RTDSP\Project\RTDSP\NewTargetConfiguration.ccxml"/>
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="com.ti.ccstudio.debug.core.sourceLocator"/>
</launchConfiguration>
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
--- a/Project/RTDSP/audio/best_case/car.wav
+++ b/Project/RTDSP/audio/best_case/car.wav
Binary files 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
--- a/Project/RTDSP/audio/best_case/car.wma
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/Project/RTDSP/audio/best_case/factory2.wav
Binary files differ
diff --git a/Project/RTDSP/audio/best_case/lynx2.wav b/Project/RTDSP/audio/best_case/lynx2.wav
index 3cb2341..fc7f065 100644
--- a/Project/RTDSP/audio/best_case/lynx2.wav
+++ b/Project/RTDSP/audio/best_case/lynx2.wav
Binary files 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
--- a/Project/RTDSP/audio/best_case/lynx2.wma
+++ /dev/null
Binary files differ
diff --git a/Project/RTDSP/audio/best_case/phantom2.wav b/Project/RTDSP/audio/best_case/phantom2.wav
index 048155c..1aba321 100644
--- a/Project/RTDSP/audio/best_case/phantom2.wav
+++ b/Project/RTDSP/audio/best_case/phantom2.wav
Binary files 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
--- a/Project/RTDSP/audio/best_case/phantom2.wma
+++ /dev/null
Binary files differ
diff --git a/Project/RTDSP/audio/best_case/phantom4.wav b/Project/RTDSP/audio/best_case/phantom4.wav
index ab52539..571a51e 100644
--- a/Project/RTDSP/audio/best_case/phantom4.wav
+++ b/Project/RTDSP/audio/best_case/phantom4.wav
Binary files 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
--- a/Project/RTDSP/audio/best_case/phantom4.wma
+++ /dev/null
Binary files 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];