diff trunk/src/Main/aimc.cc @ 320:c74acd46121b

- Added support for a very basic AIM-C file format

--- a/trunk/src/Main/aimc.cc	Wed May 19 15:28:10 2010 +0000
+++ b/trunk/src/Main/aimc.cc	Thu May 27 07:25:03 2010 +0000
@@ -23,59 +23,38 @@
 #include "Modules/BMM/ModuleGammatone.h"
 #include "Modules/BMM/ModulePZFC.h"
 #include "Modules/NAP/ModuleHCL.h"
-#include "Modules/Strobes/ModuleParabola.h"
+#include "Modules/Strobes/ModuleLocalMax.h"
 #include "Modules/SAI/ModuleSAI.h"
 #include "Modules/SSI/ModuleSSI.h"
 #include "Modules/Profile/ModuleSlice.h"
 #include "Modules/Profile/ModuleScaler.h"
 #include "Modules/Features/ModuleGaussians.h"
 #include "Modules/Output/FileOutputHTK.h"
+#include "Modules/Output/FileOutputAIMC.h"
 
 int main(int argc, char* argv[]) {
   aimc::Parameters params;
 
   int buffer_length = 480;
   params.SetInt("input.buffersize", buffer_length);
-  params.SetBool("slice.normalize", true);
-  params.SetFloat("nap.lowpass_cutoff", 100.0f);
 
   aimc::ModuleFileInput input(&params);
   aimc::ModuleGammatone bmm(&params);
-  // aimc::ModulePZFC bmm(&params);
   aimc::ModuleHCL nap(&params);
-  // aimc::ModuleParabola strobes(&params);
-  // aimc::ModuleSAI sai(&params);
-  // aimc::ModuleSSI ssi(&params);
-  aimc::ModuleSlice profile(&params);
-  aimc::ModuleScaler scaler(&params);
-  aimc::ModuleGaussians features(&params);
-  aimc::FileOutputHTK output(&params);
+  aimc::ModuleLocalMax strobes(&params);
+  aimc::ModuleSAI sai(&params);
+  aimc::FileOutputAIMC output(&params);
 
   std::string parameters_string = params.WriteString();
   printf("%s", parameters_string.c_str());
 
   input.AddTarget(&bmm);
   bmm.AddTarget(&nap);
-  nap.AddTarget(&profile);
-  //strobes.AddTarget(&sai);
-  //sai.AddTarget(&ssi);
-  //ssi.AddTarget(&profile);
-  profile.AddTarget(&scaler);
-  scaler.AddTarget(&features);
-  features.AddTarget(&output);
+  nap.AddTarget(&strobes);
+  strobes.AddTarget(&sai);
+  sai.AddTarget(&output);
 
-  float frame_period_ms = 1000.0f * buffer_length
-                          / input.GetOutputBank()->sample_rate();
-
-  output.OpenFile("test_output.htk", frame_period_ms);
-  if (input.LoadFile("test.wav")) {
-    input.Process();
-  } else {
-    printf("LoadFile failed");
-  }
-
-  input.Reset();
-  output.OpenFile("test_output_2.htk", frame_period_ms);
+  output.OpenFile("test_output.aimc", params.GetFloat("sai.frame_period_ms"));
   if (input.LoadFile("test.wav")) {
     input.Process();
   } else {