Dynamic Resampling

Author: pschatzmann

examples/sandbox/examples-sdr/generator-am_sender-audiokit/generator-am_sender-audiokit.ino

@@ -41,11 +41,7 @@ void setup() {
     modulated_data.resize(num_samples);
 
     // define resample we resample the audio data from 44100 to 13M
-    auto cfgr = resample.defaultConfig();
-    cfgr.channels = channels;
-    cfgr.sample_rate_from = sample_rate; 
-    cfgr.sample_rate = sample_rate_carrier; 
-    resample.begin(cfgr); 
+    resample.begin(sample_rate, sample_rate_carrier); 
 
     // setup test tone
     auto cfgs = sound.defaultConfig();

examples/tests/test-resample-in/test-resample-in.ino

@@ -16,11 +16,9 @@ void setup(void) {
   AudioLogger::instance().begin(Serial, AudioLogger::Warning);
 
   // define resample
-  auto cfgr = resample.defaultConfig();
-  cfgr.channels = channels;
-  cfgr.sample_rate_from = sample_rate; 
-  cfgr.sample_rate = 22050; 
-  resample.begin(cfgr); 
+  int sample_rate_from = sample_rate; 
+  int to_sample_rate = 22050; 
+  resample.begin(sample_rate_from, to_sample_rate); 
 
   // Define CSV Output
   auto config = out.defaultConfig();

examples/tests/test-resample-out/test-resample-out.ino

@@ -16,11 +16,9 @@ void setup(void) {
   AudioLogger::instance().begin(Serial, AudioLogger::Warning);
 
   // define resample
-  auto cfgr = resample.defaultConfig();
-  cfgr.channels = channels;
-  cfgr.sample_rate_from = sample_rate; 
-  cfgr.sample_rate = 22050; 
-  resample.begin(cfgr); 
+  int sample_rate_from = sample_rate; 
+  int sample_rate_to = 22050; 
+  resample.begin(sample_rate_from, sample_rate_to); 
 
   // Define CSV Output
   auto config = out.defaultConfig();

jupyter/JupyterEffects.ipynb

@@ -318,7 +318,7 @@
    "codemirror_mode": "text/x-c++src",
    "file_extension": ".cpp",
    "mimetype": "text/x-c++src",
-   "name": "C++17",
+   "name": "c++",
    "version": "17"
   },
   "widgets": {

jupyter/TestsResample.ipynb

@@ -40,10 +40,21 @@ class FilePrint : public Print {
 template <typename T> 
 class ChartT {
 public:
-  void setup(std::string fName, int channels, int channel) {
+  void setup(std::string fName, int channelCount, int channelNo) {
     this->fname = fName;
-    this->channels = channels;
-    this->channel = channel;
+    this->channels = channelCount;
+    if (this->channels==0){
+      LOGE("Setting channels to 0");
+    }
+    this->channel = channelNo;
+  }
+
+  int getChannels() {
+    return this->channels;
+  }
+
+  int getChannel() {
+    return this->channel;
   }
 
   /// Provides data as svg polyline
@@ -80,7 +91,7 @@ class ChartT {
   std::stringstream str;
   std::string fname;
   const int wav_header_size = 44;
-  int channels=1;
+  int channels=0;
   int channel=0;
 
   int transform(int x){

src/AudioLibs/Jupyter/JupyterAudio.h

@@ -16,6 +16,10 @@ namespace audio_tools {
 #  define FLUSH_OVERRIDE 
 #endif
 
+#ifndef min
+#  define min(A,B) A<B?A:B
+#endif
+
 /**
  * @brief Abstract Audio Ouptut class
  * @author Phil Schatzmann
@@ -723,5 +727,44 @@ class MemoryPrint : public AudioPrint {
 
 };
 
+/**
+ * @brief The Print API which writes the data to a byte array
+ */
+class AdapterPrintToArray : public Print {
+    public:
+        void begin(uint8_t* array, int len){
+            p_array = array;
+            size = len;
+            pos = 0;
+        }
+        
+        virtual size_t write(const uint8_t *buffer, size_t bytes) override {
+            int size_eff = min((int)bytes, availableForWrite());
+            memcpy(p_array+pos, buffer, size_eff);
+            pos+=size_eff;
+            return size_eff;
+        }
+
+
+        virtual size_t write(uint8_t ch) override {
+            LOGE("Not Supported")
+            return 0;
+        }
+
+        virtual int availableForWrite() override {
+            return size-pos;
+        }
+
+        virtual int available() {
+            return pos;
+        }
+
+    protected:
+        uint8_t* p_array = nullptr;
+        int size = 0;
+        int pos;
+
+};
+
 
 } //n namespace