SPDIFStream additional checks

Author: pschatzmann

src/AudioExperiments/AudioSPDIF.h

@@ -182,37 +182,32 @@ class SPDFOutI2SESP32 : public SPDIFOut {
 
   // initialize I2S for S/PDIF transmission
   void begin(SPDIFConfig &cfg) {
-    if (cfg.sample_rate != 0) {
-      // uninstall and reinstall I2S driver for avoiding I2S bug
-      int sample_rate = cfg.sample_rate * BMC_BITS_FACTOR;
-      int bclk = sample_rate * I2S_BITS_PER_SAMPLE * I2S_CHANNELS;
-      int mclk =
-          (I2S_BUG_MAGIC / bclk) * bclk;  // use mclk for avoiding I2S bug
-
-      i2s_config_t i2s_config = {
-          .mode = (i2s_mode_t)(I2S_MODE_MASTER | I2S_MODE_TX),
-          .sample_rate = sample_rate,
-          .bits_per_sample = (i2s_bits_per_sample_t)I2S_BITS_PER_SAMPLE,
-          .channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT,
-          .communication_format = (i2s_comm_format_t)I2S_COMM_FORMAT_STAND_I2S,
-          .intr_alloc_flags = 0,
-          .dma_buf_count = DMA_BUF_COUNT,
-          .dma_buf_len = DMA_BUF_LEN,
-          .use_apll = true,
-          .tx_desc_auto_clear = true,
-          .fixed_mclk = mclk,  // avoiding I2S bug
-      };
-      i2s_pin_config_t pin_config = {
-          .bck_io_num = -1,
-          .ws_io_num = -1,
-          .data_out_num = cfg.pin_data,
-          .data_in_num = -1,
-      };
-      ESP_ERROR_CHECK(i2s_driver_install(I2S_NUM, &i2s_config, 0, NULL));
-      ESP_ERROR_CHECK(i2s_set_pin(I2S_NUM, &pin_config));
-    } else {
-      LOGE("sample_rate must not be null")
-    }
+    // uninstall and reinstall I2S driver for avoiding I2S bug
+    int sample_rate = cfg.sample_rate * BMC_BITS_FACTOR;
+    int bclk = sample_rate * I2S_BITS_PER_SAMPLE * I2S_CHANNELS;
+    int mclk = (I2S_BUG_MAGIC / bclk) * bclk;  // use mclk for avoiding I2S bug
+
+    i2s_config_t i2s_config = {
+        .mode = (i2s_mode_t)(I2S_MODE_MASTER | I2S_MODE_TX),
+        .sample_rate = sample_rate,
+        .bits_per_sample = (i2s_bits_per_sample_t)I2S_BITS_PER_SAMPLE,
+        .channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT,
+        .communication_format = (i2s_comm_format_t)I2S_COMM_FORMAT_STAND_I2S,
+        .intr_alloc_flags = 0,
+        .dma_buf_count = DMA_BUF_COUNT,
+        .dma_buf_len = DMA_BUF_LEN,
+        .use_apll = true,
+        .tx_desc_auto_clear = true,
+        .fixed_mclk = mclk,  // avoiding I2S bug
+    };
+    i2s_pin_config_t pin_config = {
+        .bck_io_num = -1,
+        .ws_io_num = -1,
+        .data_out_num = cfg.pin_data,
+        .data_in_num = -1,
+    };
+    ESP_ERROR_CHECK(i2s_driver_install(I2S_NUM, &i2s_config, 0, NULL));
+    ESP_ERROR_CHECK(i2s_set_pin(I2S_NUM, &pin_config));
   }
 
   bool end() { return i2s_driver_uninstall(I2S_NUM) == ESP_OK; }
@@ -388,6 +383,14 @@ class SPDIFStream : public AudioStreamX {
   /// start SPDIF with the indicated configuration
   bool begin(SPDIFConfig cfg) {
     this->cfg = cfg;
+    if (cfg.sample_rate == 0) {
+      LOGE("sample_rate must not be 0")
+      return false;
+    }
+    if (cfg.channels == 0) {
+      LOGE("channels must not be 0")
+      return false;
+    }
     // Define output class if not yet defined
     if (spdif_out == nullptr) {
 #if USE_ESP32_I2S == 1