SineFromTable

Author: pschatzmann

src/AudioEffects/SoundGenerator.h

@@ -26,16 +26,17 @@ class SoundGenerator  {
             end();
         }
 
-        virtual void begin(AudioBaseInfo info) {
+        virtual bool begin(AudioBaseInfo info) {
             this->info = info;
-            begin();
+            return begin();
         }
 
-        virtual void begin() {
+        virtual bool begin() {
             LOGD(LOG_METHOD);
             active = true;
             activeWarningIssued = false;
             //info.bits_per_sample = sizeof(T)*8;
+            return true;
         }
 
         /// ends the processing
@@ -158,31 +159,34 @@ class SineWaveGenerator : public SoundGenerator<T>{
             m_phase = phase;
         }
 
-        void begin() override {
+        bool begin() override {
             LOGI(LOG_METHOD);
             SoundGenerator<T>::begin();
             this->m_deltaTime = 1.0 / SoundGenerator<T>::info.sample_rate;
+            return true;
         }
 
-        void begin(AudioBaseInfo info) override {
+        bool begin(AudioBaseInfo info) override {
             LOGI("%s::begin(channels=%d, sample_rate=%d)","SineWaveGenerator", info.channels, info.sample_rate);
             SoundGenerator<T>::begin(info);
             this->m_deltaTime = 1.0 / SoundGenerator<T>::info.sample_rate;
+            return true;
         }
 
-        void begin(AudioBaseInfo info, uint16_t frequency){
+        bool begin(AudioBaseInfo info, uint16_t frequency){
             LOGI("%s::begin(channels=%d, sample_rate=%d, frequency=%d)","SineWaveGenerator",info.channels, info.sample_rate,frequency);
             SoundGenerator<T>::begin(info);
             this->m_deltaTime = 1.0 / SoundGenerator<T>::info.sample_rate;
             if (frequency>0){
                 setFrequency(frequency);
             }
+            return true;
         }
 
-        void begin(int channels, int sample_rate, uint16_t frequency=0){
+        bool begin(int channels, int sample_rate, uint16_t frequency=0){
             SoundGenerator<T>::info.channels  = channels;
             SoundGenerator<T>::info.sample_rate = sample_rate;
-            begin(SoundGenerator<T>::info, frequency);
+            return begin(SoundGenerator<T>::info, frequency);
         }
 
         // update m_deltaTime
@@ -416,17 +420,18 @@ class GeneratorFromArray : public SoundGenerator<T> {
       LOGI("table_length: %d", (int)size);
     }
 
-    virtual void begin(AudioBaseInfo info) {
-        SoundGenerator<T>::begin(info);
+    virtual bool begin(AudioBaseInfo info) {
+        return SoundGenerator<T>::begin(info);
     }
 
     /// Starts the generation of samples
-    void begin() override {
+    bool begin() override {
       LOGI(LOG_METHOD);
       SoundGenerator<T>::begin();
       sound_index = 0;
       repeat_counter = 0;
       is_running = true;
+      return true;
     }
 
     /// Provides a single sample
@@ -497,13 +502,14 @@ class SineFromTable  : public SoundGenerator<T> {
 
         bool begin() {
             is_first = true;
-            GeneratorFromArray<float>::begin();
+            SoundGenerator<T>::begin();
             base_frequency = SoundGenerator<T>::audioInfo().sample_rate / 360.0; //122.5 hz (at 44100); 61 hz (at 22050)
             return true;
         }
 
         bool begin(AudioBaseInfo info, float frequency) {
             SoundGenerator<T>::begin(info);
+            base_frequency = SoundGenerator<T>::audioInfo().sample_rate / 360.0; //122.5 hz (at 44100); 61 hz (at 22050)
             setFrequency(frequency);
             return true;
         }
@@ -520,23 +526,28 @@ class SineFromTable  : public SoundGenerator<T> {
     protected:
         bool is_first = true;
         float amplitude;
-        float base_frequency;
+        float base_frequency = 1.0;
         float step = 1.0; 
         float step_new = 1.0; 
         float angle = 0;
+        //122.5 hz (at 44100); 61 hz (at 22050)
         const float values[181] = {0, 0.0174524, 0.0348995, 0.052336, 0.0697565, 0.0871557, 0.104528, 0.121869, 0.139173, 0.156434, 0.173648, 0.190809, 0.207912, 0.224951, 0.241922, 0.258819, 0.275637, 0.292372, 0.309017, 0.325568, 0.34202, 0.358368, 0.374607, 0.390731, 0.406737, 0.422618, 0.438371, 0.45399, 0.469472, 0.48481, 0.5, 0.515038, 0.529919, 0.544639, 0.559193, 0.573576, 0.587785, 0.601815, 0.615661, 0.62932, 0.642788, 0.656059, 0.669131, 0.681998, 0.694658, 0.707107, 0.71934, 0.731354, 0.743145, 0.75471, 0.766044, 0.777146, 0.788011, 0.798636, 0.809017, 0.819152, 0.829038, 0.838671, 0.848048, 0.857167, 0.866025, 0.87462, 0.882948, 0.891007, 0.898794, 0.906308, 0.913545, 0.920505, 0.927184, 0.93358, 0.939693, 0.945519, 0.951057, 0.956305, 0.961262, 0.965926, 0.970296, 0.97437, 0.978148, 0.981627, 0.984808, 0.987688, 0.990268, 0.992546, 0.994522, 0.996195, 0.997564, 0.99863, 0.999391, 0.999848, 1, 0.999848, 0.999391, 0.99863, 0.997564, 0.996195, 0.994522, 0.992546, 0.990268, 0.987688, 0.984808, 0.981627, 0.978148, 0.97437, 0.970296, 0.965926, 0.961262, 0.956305, 0.951057, 0.945519, 0.939693, 0.93358, 0.927184, 0.920505, 0.913545, 0.906308, 0.898794, 0.891007, 0.882948, 0.87462, 0.866025, 0.857167, 0.848048, 0.838671, 0.829038, 0.819152, 0.809017, 0.798636, 0.788011, 0.777146, 0.766044, 0.75471, 0.743145, 0.731354, 0.71934, 0.707107, 0.694658, 0.681998, 0.669131, 0.656059, 0.642788, 0.62932, 0.615661, 0.601815, 0.587785, 0.573576, 0.559193, 0.544639, 0.529919, 0.515038, 0.5, 0.48481, 0.469472, 0.45399, 0.438371, 0.422618, 0.406737, 0.390731, 0.374607, 0.358368, 0.34202, 0.325568, 0.309017, 0.292372, 0.275637, 0.258819, 0.241922, 0.224951, 0.207912, 0.190809, 0.173648, 0.156434, 0.139173, 0.121869, 0.104528, 0.0871557, 0.0697565, 0.052336, 0.0348995, 0.0174524, 0}; 
 
         float interpolate(float angle){
             bool positive = (angle<=180);
-            float angle_positive = positive ? angle : angle - 180;
+            float angle_positive = positive ? angle : angle - 180.0;
             int angle_int1 = angle_positive;
             int angle_int2 = angle_int1+1;
             float v1 = values[angle_int1];
             float v2 = values[angle_int2];
-            float result = map(angle,angle_int1,angle_int2,v1, v2);
+            float result = v1 < v2 ? map(angle_positive,angle_int1,angle_int2,v1, v2) : map(angle_positive,angle_int1,angle_int2,v2, v1)  ;
+            //float result = v1;
             return positive ? result : -result;
         }
 
+        float map(float x, float in_min, float in_max, float out_min, float out_max) {
+          return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
+        }
 };
 
 /**
@@ -583,6 +594,4 @@ class GeneratorMixer : public SoundGenerator<T> {
 
 };
 
-
-
 }