use_apll

Author: pschatzmann

examples/examples-stream/streams-i2s-csv/streams-i2s-csv.ino

@@ -11,13 +11,9 @@
 #include "AudioTools.h"
 
 using namespace audio_tools;  
-ConverterSwapBytes<int32_t> swap;
-ConverterOutlierFilter<int32_t> outlier;
-MultiConverter<int32_t> mc(outlier);
 
 I2SStream i2sStream; // Access I2S as stream
 CsvStream<int32_t> csvStream(Serial);
-//HexDumpStream csvStream(Serial);
 StreamCopy copier(csvStream, i2sStream); // copy i2sStream to csvStream
 
 // Arduino Setup
@@ -28,9 +24,9 @@ void setup(void) {
     auto cfg = i2sStream.defaultConfig(RX_MODE);
     cfg.bits_per_sample = 32;
     cfg.channels = 2;
-    cfg.sample_rate = 96000;
-    cfg.is_master = false;
-    cfg.i2s_format = I2S_MSB_FORMAT;
+    cfg.sample_rate = 44100;
+    cfg.is_master = true;
+    cfg.i2s_format = I2S_MSB_FORMAT; // or try with I2S_LSB_FORMAT
     i2sStream.begin(cfg);
 
     // make sure that we have the correct channels set up
@@ -40,5 +36,5 @@ void setup(void) {
 
 // Arduino loop - copy data
 void loop() {
-    copier.copy(mc);
+    copier.copy();
 }

src/AudioConfig.h

@@ -157,6 +157,9 @@
 #define PIN_ADC1 34 
 #define PIN_ADC2 35
 
+#define I2S_AUTO_CLEAR true
+
+
 // URLStream
 #define URL_STREAM_CORE 0
 #define URL_STREAM_PRIORITY 2

src/AudioI2S/I2SConfig.h

@@ -15,6 +15,8 @@ enum I2SFormat {
   I2S_PCM_SHORT
 };
 
+const char* i2s_formats[] = {"I2S_STD_FORMAT","I2S_LSB_FORMAT","I2S_MSB_FORMAT","I2S_PHILIPS_FORMAT","I2S_RIGHT_JUSTIFIED_FORMAT","I2S_LEFT_JUSTIFIED_FORMAT","I2S_PCM_LONG","I2S_PCM_SHORT"};
+
 
 /**
  * @brief configuration for all common i2s settings
@@ -50,14 +52,31 @@ class I2SConfig : public AudioBaseInfo {
     int pin_bck = PIN_I2S_BCK;
     int pin_data = PIN_I2S_DATA_OUT;
     I2SFormat i2s_format = I2S_STD_FORMAT;
+
+#ifdef ESP32
     bool is_digital = true;  // e.g. the ESP32 supports analog input or output
+    bool use_apll = I2S_USE_APLL; 
+    uint32_t apll_frequency_factor = 0; // apll frequency = sample_rate * apll_frequency_factor
+#endif
 
     void logInfo() {
+      LOGI("rx/tx mode: %s", rx_tx_mode == TX_MODE ? "TX":"RX");
       LOGI("port_no: %d", port_no);
+      LOGI("is_master: %s", is_master ? "Master":"Slave");
+      LOGI("sample rate: %d", sample_rate);
+      LOGI("bits per sample: %d", bits_per_sample);
+      LOGI("number of channels: %d", channels);
+      LOGI("i2s_format: %s", i2s_formats[i2s_format]);
+#ifdef ESP32
+      if (use_apll) {
+        LOGI("use_apll: %s", use_apll ? "true" : "false");
+        LOGI("apll_frequency_factor: %d", apll_frequency_factor);
+      }
+#endif
+
       LOGI("pin_ws: %d", pin_ws);
       LOGI("pin_bck: %d", pin_bck);
       LOGI("pin_data: %d", pin_data);
-      LOGI("i2s_format: %d", i2s_format);
     }
 
 };

src/AudioI2S/I2SESP32.h

@@ -7,6 +7,7 @@
 
 #include "driver/i2s.h"
 #include "esp_a2dp_api.h"
+#include "esp_system.h"
 
 namespace audio_tools {
 
@@ -35,6 +36,7 @@ class I2SBase {
     /// starts the DAC 
     void begin(I2SConfig cfg) {
       LOGD(LOG_METHOD);
+      cfg.logInfo();
       this->cfg = cfg;
       this->i2s_num = (i2s_port_t) cfg.port_no; 
       setChannels(cfg.channels);
@@ -48,12 +50,13 @@ class I2SBase {
             .intr_alloc_flags = ESP_INTR_FLAG_LEVEL1, // default interrupt priority
             .dma_buf_count = I2S_BUFFER_COUNT,
             .dma_buf_len = I2S_BUFFER_SIZE,
-            .use_apll = I2S_USE_APLL,
-            .tx_desc_auto_clear = true // avoiding noise in case of data unavailability
+            .use_apll = cfg.use_apll,
+            .tx_desc_auto_clear = I2S_AUTO_CLEAR, 
+            .fixed_mclk = cfg.use_apll ? cfg.sample_rate * cfg.apll_frequency_factor : 0 
+
       };
       i2s_config = i2s_config_new;
-      logConfig();
-           
+
       // We make sure that we can reconfigure
       if (is_started) {
           end();
@@ -73,7 +76,6 @@ class I2SBase {
             .data_out_num = cfg.rx_tx_mode == TX_MODE ? cfg.pin_data : I2S_PIN_NO_CHANGE,
             .data_in_num = cfg.rx_tx_mode == RX_MODE ? cfg.pin_data : I2S_PIN_NO_CHANGE
         };
-        logConfigPins(pin_config);
 
         if (i2s_set_pin(i2s_num, &pin_config)!= ESP_OK){
             LOGE("%s - %s", __func__, "i2s_set_pin");
@@ -244,22 +246,6 @@ class I2SBase {
       return mode;
     }
 
-
-    void logConfig() {
-      LOGI("rx/tx mode: %s", cfg.rx_tx_mode == TX_MODE ? "TX":"RX");
-      LOGI("sample rate: %d", cfg.sample_rate);
-      LOGI("bits per sample: %d", cfg.bits_per_sample);
-      LOGI("number of channels: %d", cfg.channels);
-      LOGI("is_master: %s", cfg.is_master ? "Master":"Slave");
-      LOGI("mode: %d", cfg.i2s_format);
-    }
-
-    void logConfigPins(i2s_pin_config_t pin_config){
-      LOGI("pin bck_io_num: %d", cfg.pin_bck);
-      LOGI("pin ws_io_num: %d", cfg.pin_ws);
-      LOGI("pin data_num: %d", cfg.pin_data);
-    }
-
 };
 
 }