comparison trunk/src/Modules/SSI/ModuleSSI.cc @ 411:a908972d234e

- Added support for movies!

                                                 false);
 
   // Time from the zero-lag line of the SAI from which to start searching
   // for a maximum in the input SAI's temporal profile.
   pitch_search_start_ms_ = parameters_->DefaultFloat(
-    "ssi.pitch_search_start_ms", 2.0f);
+      "ssi.pitch_search_start_ms", 2.0f);
 
   // Total width in cycles of the whole SSI
   ssi_width_cycles_ = parameters_->DefaultFloat("ssi.width_cycles", 10.0f);
 
   // Set to true to make the cycles axis logarithmic (ie indexing by gamma

                 "truncated at %d samples wide. This corresponds to a width "
                 "of %f cycles."), ssi_width_cycles_, buffer_length_,
                 ssi_width_samples_, cycles);
     ssi_width_cycles_ = cycles;
   }
+  for (int i = 0; i < input.channel_count(); ++i) {
+    output_.set_centre_frequency(i, input.centre_frequency(i));
+  }
+  
   output_.Initialize(channel_count_, ssi_width_samples_, sample_rate_);
   return true;
 }
 
 void ModuleSSI::ResetInternal() {

   float gamma_min = -1.0f;
   float gamma_max = log2(ssi_width_cycles_);
 
   for (int ch = 0; ch < channel_count_; ++ch) {
     float centre_frequency = input.centre_frequency(ch);
+    float cycle_samples = sample_rate_ / centre_frequency;
     
     float channel_weight = 1.0f;
     int cutoff_index = buffer_length_ - 1;
     if (do_pitch_cutoff_) {
       if (pitch_index < cutoff_index) {
         if (weight_by_cutoff_) {
           channel_weight = static_cast<float>(buffer_length_)
-                    / static_cast<float>(pitch_index);
+                           / static_cast<float>(pitch_index);
         }
         cutoff_index = pitch_index;
       }
     }
     
     // tanh(3) is about 0.995. Seems reasonable. 
-    float smooth_pitch_constant = smooth_offset_cycles_ * 3.0f;
+    float smooth_pitch_constant = 3.0f / smooth_offset_cycles_;
     float pitch_h = 0.0f;
     if (do_smooth_offset_) {
-      if (log_cycles_axis_) {
-        float gamma = gamma_min + (gamma_max - gamma_min)
-                                   * static_cast<float>(pitch_index)
-                                   / static_cast<float>(ssi_width_samples_);
-        pitch_h = pow(2.0f, gamma);
-      } else {
-        pitch_h = static_cast<float>(pitch_index) * ssi_width_cycles_
-            / static_cast<float>(ssi_width_samples_);
-      }
+      pitch_h = static_cast<float>(pitch_index) / cycle_samples;
     }
     
-    // Copy the buffer from input to output, addressing by h-value
+    // Copy the buffer from input to output, addressing by h-value.
     for (int i = 0; i < ssi_width_samples_; ++i) {
       float h;
-      float cycle_samples = sample_rate_ / centre_frequency;
       if (log_cycles_axis_) {
         float gamma = gamma_min + (gamma_max - gamma_min)
                                    * static_cast<float>(i)
                                    / static_cast<float>(ssi_width_samples_);
         h = pow(2.0f, gamma);

 
       float weight = channel_weight;
       
       if (do_smooth_offset_ && do_pitch_cutoff_) {
         // Smoothing around the pitch cutoff line.
-        weight *= (1.0f + tanh(smooth_pitch_constant * (pitch_h - h))) / 2.0f;
+        float pitch_weight = (1.0f + tanh((pitch_h - h)
+                                          * smooth_pitch_constant)) / 2.0f;
+        weight *= pitch_weight;
+        //LOG_INFO("Channel %d, Sample %d. Pitch weight: %f", ch, i, pitch_weight);
       }
 
       if (weight_by_scaling_) {
         if (centre_frequency > pivot_cf_) {
           weight *= (centre_frequency / pivot_cf_);