Changeset 85ebab8

Timestamp:

Jul 27, 2012, 6:39:20 PM (12 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

063fa5a

Parents:

d00e223 (diff), dea34a1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into io

Files:

• interfaces/python/demo_spectrogram.py (added)
• interfaces/python/demo_tss.py (added)
• src/spectral/tss.c (modified) (2 diffs)

src/spectral/tss.c

@@ -61 +61 @@
     theta2[j] = theta1[j];
     theta1[j] = input->phas[j];
-  }
 
-  for (j=0;j<nbins; j++){
     /* transient analysis */
     test = (ABS(dev[j]) > parm*oft1[j]);
     trans->norm[j] = input->norm[j] * test;
     trans->phas[j] = input->phas[j] * test;
-  }
 
-  for (j=0;j<nbins; j++){
     /* steady state analysis */
     test = (ABS(dev[j]) < parm*oft2[j]);
@@ -76 +72 @@
     stead->phas[j] = input->phas[j] * test;
 
-    /*increase sstate probability for sines */
+    /*increase probability for transient */
     test = (trans->norm[j]==0.);
     oft1[j]  = test;
+    test = (trans->norm[j]>0.);
+    oft1[j] += alpha*test;
+    test = (oft1[j]>1. && trans->norm[j]>0.);
+    oft1[j] += beta*test;
+
+    /*increase probability for steady states */
     test = (stead->norm[j]==0.);
     oft2[j]  = test;
-    test = (trans->norm[j]>0.);
-    oft1[j] += alpha*test;
     test = (stead->norm[j]>0.);
     oft2[j] += alpha*test;
-    test = (oft1[j]>1. && trans->norm[j]>0.);
-    oft1[j] += beta*test;
     test = (oft2[j]>1. && stead->norm[j]>0.);
     oft2[j] += beta*test;