more pitch detection testing; using both algs and only setting pitch when they match within some error works decently but at the cost of running both; at least suggests that they tend to make different errors

Matthew Wang committed 6 years ago

Commit d634fb31 parent 45af5ea3 files · +21 −13Browse files

Showing the changes to TestPlugin/Source/MyTest.cpp (1 of 3 files). Show all

Unified · Split

 tZeroCrossingCounter zc;
 tEnvelopeFollower ef;
+tCycle sine;
 float gain;
 float dtime;
 bool buttonState;
     tZeroCrossingCounter_init(&zc, 128);
     tEnvelopeFollower_init(&ef, 0.02f, 0.9999f);
+    tCycle_init(&sine);
+    tCycle_setFreq(&sine, 100);
 }
 inline double getSawFall(double angle) {
     float freq = 1.0f/tPeriodDetection_tick(&pd, input) * leaf.sampleRate;
     tPitchDetector_tick(&detector, input);
+    float altFreq = tPitchDetector_getFrequency(&detector);
-    if (tPitchDetector_getPeriodicity(&detector) > 0.0)
+    if (fabsf(1.0f - (freq / altFreq)) < 0.05f)
-    {
-        float altFreq = tPitchDetector_getFrequency(&detector);
-//        if (fabsf(lastFreq - freq) > fabsf(lastFreq - altFreq))
-            freq = altFreq;
-    }
 //    if (tZeroCrossingCounter_tick(&zc, input) < 0.05 && freq > 0.0f)
     {
-        tMBTriangle_setFreq(&btri, freq);
+        tCycle_setFreq(&sine, altFreq);
     }
     float g = tEnvelopeFollower_tick(&ef, input);
     lastFreq = freq;
-    return input + tMBTriangle_tick(&btri) * g * 10.0f;
+    return tCycle_tick(&sine) * g * 2.0f + input;
 }
 int firstFrame = 1;
 bool lastState = false, lastPlayState = false;
 void    LEAFTest_block           (void)
 {
-    DBG(tPitchDetector_getFrequency(&detector));
+    float periodicity = tPitchDetector_getPeriodicity(&detector);
-    DBG(tPitchDetector_getPeriodicity(&detector));
+    if (periodicity > 0.99f)
+    {
+        DBG(tPitchDetector_getFrequency(&detector));
+        DBG(tPitchDetector_getPeriodicity(&detector));
+    }
     //    if (firstFrame == 1)
     //    {
     //        tBuffer_record(&buff); // starts recording

more pitch detection testing; using both algs and only setting pitch when they match within some error works decently but at the cost of running both; at least suggests that they tend to make different errors

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code