From 8468e093fc74b4c6f304a3af43f95d3547f749bb Mon Sep 17 00:00:00 2001
From: gemu2015 <gmutz2010@googlemail.com>
Date: Fri, 11 Sep 2020 15:45:59 +0200
Subject: [PATCH] i2s audio update

save heap memory on esp32 with psram
---
 tasmota/xdrv_42_i2s_audio.ino | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/tasmota/xdrv_42_i2s_audio.ino b/tasmota/xdrv_42_i2s_audio.ino
index 77492992b..5a31d832b 100644
--- a/tasmota/xdrv_42_i2s_audio.ino
+++ b/tasmota/xdrv_42_i2s_audio.ino
@@ -52,7 +52,7 @@ AudioFileSourceFS *file;
 AudioOutputI2S *out;
 AudioFileSourceID3 *id3;
 AudioGeneratorMP3 *decoder = NULL;
-
+void *mp3ram = NULL;
 
 #ifdef USE_WEBRADIO
 AudioFileSourceICYStream *ifile = NULL;
@@ -210,6 +210,12 @@ void I2S_Init(void) {
   is2_volume=10;
   out->SetGain(((float)is2_volume/100.0)*4.0);
   out->stop();
+  mp3ram = nullptr;
+
+#ifdef ESP32
+  if (psramFound()) {
+    mp3ram = heap_caps_malloc(preallocateCodecSize, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
+  }
 
 #ifdef USE_WEBRADIO
   if (psramFound()) {
@@ -223,6 +229,7 @@ void I2S_Init(void) {
     //Serial.printf_P(PSTR("FATAL ERROR:  Unable to preallocate %d bytes for app\n"), preallocateBufferSize+preallocateCodecSize);
   }
 #endif // USE_WEBRADIO
+#endif // ESP32
 }
 
 #ifdef ESP32
@@ -285,7 +292,7 @@ void Webradio(const char *url) {
     retryms = millis() + 2000;
   }
 
-  xTaskCreatePinnedToCore(mp3_task2, "MP3", 8192, NULL, 3, &mp3_task_h, 1);
+  xTaskCreatePinnedToCore(mp3_task2, "MP3-2", 8192, NULL, 3, &mp3_task_h, 1);
 }
 
 void mp3_task2(void *arg){
@@ -366,7 +373,12 @@ void Play_mp3(const char *path) {
 
   file = new AudioFileSourceFS(*fsp,path);
   id3 = new AudioFileSourceID3(file);
-  mp3 = new AudioGeneratorMP3();
+
+  if (mp3ram) {
+    mp3 = new AudioGeneratorMP3(mp3ram, preallocateCodecSize);
+  } else {
+    mp3 = new AudioGeneratorMP3();
+  }
   mp3->begin(id3, out);
 
   if (I2S_Task) {