Rename to Str and StrView

Author: pschatzmann

examples/build-examples-log.txt

@@ -82,15 +82,15 @@
 ../examples/examples-audiokit/streams-synthstk-audiokit -> rc=0
 ../examples/examples-audiokit/streams-tf-audiokit -> rc=0
 ../examples/examples-tts/streams-azure_tts-i2s -> rc=0
-../examples/examples-tts/streams-espeak-audiokit -> rc=0
-../examples/examples-tts/streams-espeak-i2s -> rc=0
+../examples/examples-tts/streams-espeak-audiokit -> rc=1
+../examples/examples-tts/streams-espeak-i2s -> rc=1
 ../examples/examples-tts/streams-flite-audiokit -> rc=1
 ../examples/examples-tts/streams-flite-i2s -> rc=1
 ../examples/examples-tts/streams-google-audiokit -> rc=0
 ../examples/examples-tts/streams-sam-audiokit -> rc=0
 ../examples/examples-tts/streams-sam-i2s -> rc=0
-../examples/examples-tts/streams-simple_tts-a2dp -> rc=0
-../examples/examples-tts/streams-simple_tts-i2s -> rc=0
+../examples/examples-tts/streams-simple_tts-a2dp -> rc=1
+../examples/examples-tts/streams-simple_tts-i2s -> rc=1
 ../examples/examples-tts/streams-tts-i2s -> rc=0
 ../examples/examples-tts/streams-url_wav-i2s -> rc=0
 ../examples/examples-dsp/examples-maximilian/01-TestTone -> rc=0
@@ -192,7 +192,7 @@
 ../examples/examples-communication/http-client/player-url_icy-audiokit -> rc=0
 ../examples/examples-communication/http-client/player-url_icy-i2s -> rc=0
 ../examples/examples-communication/http-client/player-url_subclass-i2s -> rc=0
-../examples/examples-communication/http-client/streams-eth_url_mp3_helix-i2s -> rc=0
+../examples/examples-communication/http-client/streams-eth_url_mp3_helix-i2s -> rc=1
 ../examples/examples-communication/http-client/streams-http_post -> rc=0
 ../examples/examples-communication/http-client/streams-url_aac-audiokit -> rc=0
 ../examples/examples-communication/http-client/streams-url_aac-i2s -> rc=0
@@ -211,17 +211,17 @@
 ../examples/examples-communication/http-client/streams-url_raw-i2s -> rc=0
 ../examples/examples-communication/http-client/streams-url_raw-serial -> rc=0
 ../examples/examples-communication/http-client/streams-url_vorbis_i2s -> rc=0
-../examples/examples-communication/http-server/player-sd-webserverex_mp3 -> rc=0
+../examples/examples-communication/http-server/player-sd-webserverex_mp3 -> rc=1
 ../examples/examples-communication/http-server/README.md -> rc=1
 ../examples/examples-communication/http-server/streams-audiokit-webserver_aac -> rc=0
-../examples/examples-communication/http-server/streams-audiokit-webserver_mp3 -> rc=0
+../examples/examples-communication/http-server/streams-audiokit-webserver_mp3 -> rc=1
 ../examples/examples-communication/http-server/streams-audiokit-webserver_wav -> rc=0
 ../examples/examples-communication/http-server/streams-effect-webserver_wav -> rc=0
 ../examples/examples-communication/http-server/streams-flite-webserver_wav -> rc=1
 ../examples/examples-communication/http-server/streams-generator-webserver_aac -> rc=0
-../examples/examples-communication/http-server/streams-generator-webserverex_wav -> rc=0
-../examples/examples-communication/http-server/streams-generator-webserverex_wav1 -> rc=0
-../examples/examples-communication/http-server/streams-generator-webserver_mp3 -> rc=0
+../examples/examples-communication/http-server/streams-generator-webserverex_wav -> rc=1
+../examples/examples-communication/http-server/streams-generator-webserverex_wav1 -> rc=1
+../examples/examples-communication/http-server/streams-generator-webserver_mp3 -> rc=1
 ../examples/examples-communication/http-server/streams-generator-webserver_ogg -> rc=0
 ../examples/examples-communication/http-server/streams-generator-webserver_wav -> rc=0
 ../examples/examples-communication/http-server/streams-i2s-webserver_wav -> rc=0
@@ -258,7 +258,7 @@
 ../examples/tests/codecs/test-codec-opusogg -> rc=0
 ../examples/tests/codecs/test-codec-sbc -> rc=0
 ../examples/tests/codecs/test-codec-wav-adpcm -> rc=0
-../examples/tests/codecs/test-compile-all -> rc=0
+../examples/tests/codecs/test-compile-all -> rc=1
 ../examples/tests/codecs/test-container-binary -> rc=0
 ../examples/tests/codecs/test-container-binary-meta -> rc=0
 ../examples/tests/codecs/test-container-ogg -> rc=0
@@ -303,9 +303,9 @@
 ../examples/tests/etc/test-tdm -> rc=0
 ../examples/tests/etc/test-write-memory -> rc=0
 ../examples/tests/fft/fft-cmsis -> rc=1
-../examples/tests/fft/fft-esp32 -> rc=0
+../examples/tests/fft/fft-esp32 -> rc=1
 ../examples/tests/fft/fft-espressif -> rc=0
-../examples/tests/fft/fft-kiss -> rc=0
+../examples/tests/fft/fft-kiss -> rc=1
 ../examples/tests/fft/fft-real -> rc=0
 ../examples/tests/fft/fft-topn -> rc=0
 ../examples/tests/fft/fft-window -> rc=0

examples/examples-communication/http-client/player-url_subclass-i2s/AudioSourceIcyUrl.h

@@ -30,7 +30,7 @@ class AudioSourceIcyUrl : public AudioSourceURL {
         /// Returns the last section of a url: https://22323.live.streamtheworld.com/TOPRETRO.mp3 gives TOPRETRO.mp3
         const char *urlName(){
             const char* result = "";
-            Str tmpStr(toStr());
+            StrView tmpStr(toStr());
             int pos = tmpStr.lastIndexOf("/");
             if (pos>0){
                 result = toStr()+pos+1;
@@ -40,7 +40,7 @@ class AudioSourceIcyUrl : public AudioSourceURL {
 
         /// Returns the icy name if available otherwise we use our custom logic
         const char* name() {
-            Str result(icyName());
+            StrView result(icyName());
             if (result.isEmpty()){
                 result.set(urlName());
             }

examples/examples-communication/usb/microphone/microphone.ino

@@ -0,0 +1,49 @@
+/*********************************************************************
+ This example generates a sawtooth that you can output on your PC
+ We use the AudioTools to generate the data input.
+
+ We could use the callback function here as well, but we demo how
+ to integrate with a (fast) Arduino Stream.
+
+*********************************************************************/
+
+#include "Adafruit_TinyUSB.h" // https://github.com/pschatzmann/Adafruit_TinyUSB_Arduino
+#include "AudioTools.h"  // https://github.com/pschatzmann/arduino-audio-tools
+
+Adafruit_USBD_Audio usb;
+AudioInfo info(44100, 2, 16);
+SawToothGenerator<int16_t> sawtooth;               
+GeneratedSoundStream<int16_t> sawthooth_stream(sawtooth);
+
+void setup() {
+  // Manual begin() is required on core without built-in support e.g. mbed rp2040
+  if (!TinyUSBDevice.isInitialized()) {
+    TinyUSBDevice.begin(0);
+  }
+
+  Serial.begin(115200);
+  //while(!Serial);  // wait for serial
+
+  // generate 493 hz (note B4)
+  sawtooth.begin(info, 493.0f);
+
+  // Start USB device as Audio Source
+  usb.setInput(sawthooth_stream);
+  usb.begin(info.sample_rate, info.channels, info.bits_per_sample);
+
+  // If already enumerated, additional class driverr begin() e.g msc, hid, midi won't take effect until re-enumeration
+  if (TinyUSBDevice.mounted()) {
+    TinyUSBDevice.detach();
+    delay(10);
+    TinyUSBDevice.attach();
+  }
+}
+
+void loop() {
+  #ifdef TINYUSB_NEED_POLLING_TASK
+  // Manual call tud_task since it isn't called by Core's background
+  TinyUSBDevice.task();
+  #endif
+  // optional: use LED do display status
+  usb.updateLED();
+}

examples/examples-tts/streams-google-audiokit/streams-google-audiokit.ino

@@ -20,13 +20,13 @@ URLStream url("ssid","password");
 AudioBoardStream i2s(AudioKitEs8388V1); // final output of decoded stream
 EncodedAudioStream dec(&i2s, new MP3DecoderHelix()); // Decoding stream
 StreamCopy copier(dec, url); // copy url to decoder
-StrExt query("http://translate.google.com/translate_tts?ie=UTF-8&tl=%1&client=tw-ob&ttsspeed=%2&q=%3");
+Str query("http://translate.google.com/translate_tts?ie=UTF-8&tl=%1&client=tw-ob&ttsspeed=%2&q=%3");
 
 const char* tts(const char* text, const char* lang="en", const char* speed="1"){
   query.replace("%1",lang);
   query.replace("%2",speed);
 
-  StrExt encoded(text);
+  Str encoded(text);
   encoded.urlEncode();
   query.replace("%3", encoded.c_str());
   return query.c_str();

src/AudioConfig.h

@@ -234,6 +234,7 @@ typedef WiFiClient WiFiClientSecure;
 #  define ESP32X
 #  define USE_TDM
 #  define USE_PDM
+#  define USE_PDM_RX
 #endif
 #if defined(ESP32)  && defined(CONFIG_IDF_TARGET_ESP32H2)
 #  define ESP32H2
@@ -252,6 +253,7 @@ typedef WiFiClient WiFiClientSecure;
 #  define ESP32X
 #  define USE_TDM
 #  define USE_PDM
+#  define USE_PDM_RX
 #endif
 
 // for all ESP32 families
@@ -278,7 +280,7 @@ typedef WiFiClient WiFiClientSecure;
 
 #define USE_ANALOG
 #define USE_I2S
-#define USE_PDM
+#define USE_PDM_RX
 
 #ifdef ARDUINO
 #  define USE_PWM

src/AudioTools/AudioCodecs/CodecBase64.h

@@ -1,7 +1,6 @@
 
 #pragma once
 
-#include "AudioTools/CoreAudio/AudioBasic/Str.h"
 #include "AudioTools/AudioCodecs/AudioCodecsBase.h"
 
 namespace audio_tools {

src/AudioTools/AudioCodecs/CodecMTS.h

@@ -83,9 +83,9 @@ enum MTSStreamType {
  * @copyright GPLv3
  */
 
-class MTSDecoder : public AudioDecoder {
+class MTSDecoder1 : public AudioDecoder {
  public:
-  MTSDecoder() = default;
+  MTSDecoder1() = default;
 
   bool begin() override {
     TRACED();

src/AudioTools/AudioCodecs/CodecTSDemux.h

@@ -45,9 +45,9 @@ struct AllocSize {
  * @copyright GPLv3
  */
 
-class MTSDecoder : public AudioDecoder {
+class MTSDecoder1 : public AudioDecoder {
  public:
-  MTSDecoder() { 
+  MTSDecoder1() { 
     self = this; 
   };
 
@@ -111,7 +111,7 @@ class MTSDecoder : public AudioDecoder {
 
   size_t write(const uint8_t *data, size_t len) override {
     if (!is_active) return 0;
-    LOGD("MTSDecoder::write: %d", (int)len);
+    LOGD("MTSDecoder1::write: %d", (int)len);
     size_t result = buffer.writeArray((uint8_t*)data, len);
     // demux
     demux(underflowLimit);
@@ -150,7 +150,7 @@ class MTSDecoder : public AudioDecoder {
   }
 
  protected:
-  static MTSDecoder *self;
+  static MTSDecoder1 *self;
   int underflowLimit = MTS_UNDERFLOW_LIMIT;
   bool is_active = false;
   bool is_write_active = false;
@@ -248,8 +248,8 @@ class MTSDecoder : public AudioDecoder {
   static void event_cb(TSDemuxContext *ctx, uint16_t pid, TSDEventId event_id,
                        void *data) {
     TRACED();
-    if (MTSDecoder::self != nullptr) {
-      MTSDecoder::self->event_cb_local(ctx, pid, event_id, data);
+    if (MTSDecoder1::self != nullptr) {
+      MTSDecoder1::self->event_cb_local(ctx, pid, event_id, data);
     }
   }
 
@@ -963,6 +963,6 @@ class MTSDecoder : public AudioDecoder {
 
 };
 // init static variable
-MTSDecoder *MTSDecoder::self = nullptr;
+MTSDecoder1 *MTSDecoder1::self = nullptr;
 
 }  // namespace audio_tools

src/AudioTools/AudioCodecs/CodecWAV.h

@@ -2,7 +2,7 @@
 
 #include "AudioTools/AudioCodecs/AudioCodecsBase.h"
 #include "AudioTools/AudioCodecs/AudioFormat.h"
-#include "AudioTools/CoreAudio/AudioBasic/Str.h"
+#include "AudioTools/CoreAudio/AudioBasic/StrView.h"
 
 #define READ_BUFFER_SIZE 512
 #define MAX_WAV_HEADER_LEN 200
@@ -93,7 +93,7 @@ class WAVHeader {
 
   /// Determines the data start position using the data tag
   int getDataPos() {
-    int pos = Str((char*)buffer.data(),MAX_WAV_HEADER_LEN, buffer.available()).indexOf("data"); 
+    int pos = StrView((char*)buffer.data(),MAX_WAV_HEADER_LEN, buffer.available()).indexOf("data"); 
     return pos > 0 ? pos + 8 : 0;
   }
 
@@ -149,7 +149,7 @@ class WAVHeader {
   }
 
   int indexOf(const char* str){
-    return Str((char*)buffer.data(),MAX_WAV_HEADER_LEN, buffer.available()).indexOf(str);
+    return StrView((char*)buffer.data(),MAX_WAV_HEADER_LEN, buffer.available()).indexOf(str);
   }
 
   uint32_t read_tag() {
@@ -255,6 +255,8 @@ class WAVHeader {
  * determine the format. If no AudioDecoderExt is specified we just write the PCM
  * data to the output that is defined by calling setOutput(). You can define a
  * ADPCM decoder to decode WAV files that contain ADPCM data.
+ * Please note that you need to call begin() everytime you process a new file to
+ * let the decoder know that we start with a new header.
  * @ingroup codecs
  * @ingroup decoder
  * @author Phil Schatzmann

src/AudioTools/AudioCodecs/ContainerAVI.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <string.h>
 #include "AudioTools/AudioCodecs/AudioCodecsBase.h"
-#include "AudioTools/CoreAudio/AudioBasic/StrExt.h"
+#include "AudioTools/CoreAudio/AudioBasic/Str.h"
 #include "AudioTools/AudioCodecs/AudioFormat.h"
 #include "AudioTools/Video/Video.h"
 #include "AudioTools/CoreAudio/Buffers.h"
@@ -155,7 +155,7 @@ enum ParseState {
  */
 class ParseObject {
 public:
-  void set(size_t currentPos, Str id, size_t size, ParseObjectType type) {
+  void set(size_t currentPos, StrView id, size_t size, ParseObjectType type) {
     set(currentPos, id.c_str(), size, type);
   }
 
@@ -367,8 +367,8 @@ class AVIDecoder : public ContainerDecoder {
   long open_subchunk_len = 0;
   long current_pos = 0;
   long movi_end_pos = 0;
-  StrExt spaces;
-  StrExt str;
+  Str spaces;
+  Str str;
   char video_format[5] = {0};
   bool is_metadata_ready = false;
   bool (*validation_cb)(AVIDecoder &avi) = nullptr;
@@ -452,9 +452,9 @@ class AVIDecoder : public ContainerDecoder {
       if (pos >= 0) {
         consume(pos);
         ParseObject tmp = tryParseList();
-        if (Str(tmp.id()).equals("strl")) {
+        if (StrView(tmp.id()).equals("strl")) {
           parse_state = ParseStrl;
-        } else if (Str(tmp.id()).equals("movi")) {
+        } else if (StrView(tmp.id()).equals("movi")) {
           parse_state = ParseMovi;
         } else {
           // e.g. ignore info
@@ -470,7 +470,7 @@ class AVIDecoder : public ContainerDecoder {
 
     case ParseMovi: {
       ParseObject movi = tryParseList();
-      if (Str(movi.id()).equals("movi")) {
+      if (StrView(movi.id()).equals("movi")) {
         consume(LIST_HEADER_SIZE);
         is_metadata_ready = true;
         if (validation_cb)
@@ -486,7 +486,7 @@ class AVIDecoder : public ContainerDecoder {
     case SubChunk: {
       // rec is optinal
       ParseObject hdrl = tryParseList();
-      if (Str(hdrl.id()).equals("rec")) {
+      if (StrView(hdrl.id()).equals("rec")) {
         consume(CHUNK_HEADER_SIZE);
         processStack(hdrl);
       }
@@ -623,7 +623,7 @@ class AVIDecoder : public ContainerDecoder {
 
   ParseObject tryParseList(const char *id) {
     ParseObject result;
-    Str &list_id = getStr(8, 4);
+    StrView &list_id = getStr(8, 4);
     if (list_id.equals(id) && getStr(0, 3).equals("LIST")) {
       result.set(current_pos, getStr(8, 4), getInt(4), AVIList);
     }
@@ -693,7 +693,7 @@ class AVIDecoder : public ContainerDecoder {
   }
 
   /// Provides the string at the indicated byte offset with the indicated length
-  Str &getStr(int offset, int len) {
+  StrView &getStr(int offset, int len) {
     str.setCapacity(len + 1);
     const char *data = (const char *)parse_buffer.data();
     str.copyFrom((data + offset), len, 5);