IDF as component

Author: pschatzmann

CMakeLists.txt

@@ -5,7 +5,7 @@ if (DEFINED ESP_PLATFORM)
   idf_component_register(
       SRC_DIRS src src/utils src/libhelix-aac src/libhelix-mp3
       INCLUDE_DIRS src src/utils src/libhelix-aac src/libhelix-mp3
-      REQUIRES arduino-esp32
+  #    REQUIRES arduino-esp32
   )
 
   target_compile_options(${COMPONENT_LIB} INTERFACE -Wno-error -Wno-format)

src/CommonHelix.h

@@ -92,11 +92,13 @@ class CommonHelix {
   /// returns true if active
   operator bool() { return active; }
 
+#ifdef ARDUINO
   /// Provides the timestamp in ms of last write
   uint64_t timeOfLastWrite() { return time_last_write; }
 
   /// Provides the timestamp in ms of last decoded result
   uint64_t timeOfLastResult() { return time_last_result; }
+#endif
 
   /// Decode all open packets
   void flush() {
@@ -212,7 +214,9 @@ class CommonHelix {
   /// Decoding Loop: We decode the procided data until we run out of data
   virtual size_t writeChunk(const void *in_ptr, size_t in_size) {
     LOG_HELIX(LogLevelHelix::Info, "writeChunk %zu", in_size);
+#ifdef ARDUINO
     time_last_write = millis();
+#endif
     size_t result = frame_buffer.writeArray((uint8_t *)in_ptr, in_size);
 
     while (frame_buffer.available() >= minFrameBufferSize()) {

src/MP3DecoderHelix.h

@@ -113,7 +113,7 @@ class MP3DecoderHelix : public CommonHelix {
     int processed = 0;
     int available = frame_buffer.available();
     int bytes_left = frame_buffer.available();
-    LOG_HELIX(LogLevelHelix::Info, "decode: %d", frame_buffer.available());
+    LOG_HELIX(LogLevelHelix::Info, "decode: %d (left:%d)", available, bytes_left);
     uint8_t *data = frame_buffer.data();
     int rc = MP3Decode(decoder, &data, &bytes_left, (short *)pcm_buffer.data(),
                        mp3_type);

src/libhelix-aac/aaccommon.h

@@ -56,8 +56,10 @@
 #  define AAC_ENABLE_SBR
 #endif //  HELIX_FEATURE_AUDIO_CODEC_AAC_SBR.
 
+#ifndef ARDUINO
 #pragma GCC optimize ("O3")
-
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+#endif
 #include "aacdec.h"
 #include "statname.h"
 

src/libhelix-aac/aacdec.h

@@ -68,7 +68,7 @@
 #
 #elif defined(_SOLARIS) && !defined(__GNUC__)
 #
-#elif defined(ARDUINO)
+#elif defined(ARDUINO) || defined(ESP32)
 #
 #else
 #error No platform defined. See valid options in aacdec.h

src/libhelix-aac/assembly.h

@@ -500,7 +500,7 @@ static __inline Word64 MADD64(Word64 sum64, int x, int y)
 	return sum64;
 }
 
-#elif defined(ARDUINO) || defined(__GNUC__) && (defined(__powerpc__) || defined(__POWERPC__)) || (defined (_SOLARIS) && !defined (__GNUC__) && !defined (_SOLARISX86))
+#elif defined(ARDUINO) || defined(ESP32) || defined(__GNUC__) && (defined(__powerpc__) || defined(__POWERPC__)) || (defined (_SOLARIS) && !defined (__GNUC__) && !defined (_SOLARISX86))
 
 typedef long long Word64;
 

src/libhelix-mp3/assembly.h

@@ -417,7 +417,7 @@ static __inline Word64 SAR64(Word64 x, int n)
 	return (x >> n);
 }
 
-#elif defined(ARDUINO) || defined(__APPLE__) || defined(__unix__)
+#elif defined(ARDUINO) || defined(ESP32) || defined(__APPLE__) || defined(__unix__)
 
 static __inline int FASTABS(int x)
 {

src/utils/Allocator.h

@@ -2,9 +2,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include "utils/helix_log.h"
-#ifdef ESP32
-#  include "Arduino.h"
+#if defined(ESP32)
+#  if defined(ARDUINO)
+#    include "Arduino.h"
+#  else
+#    include "esp_heap_caps.h"
+#  endif
 #endif
+
 namespace libhelix {
 
 /**
@@ -93,8 +98,12 @@ class AllocatorExt : public Allocator {
   void* do_allocate(size_t size) {
     void* result = nullptr;
     if (size == 0) size = 1;
-#ifdef ESP32
+#if defined(ESP32) 
+#  if defined(ARDUINO)
     result = ps_malloc(size);
+#  else
+    result = heap_caps_malloc(size, MALLOC_CAP_SPIRAM);
+#  endif
 #endif
     if (result == nullptr) result = malloc(size);
     if (result == nullptr) {
@@ -107,7 +116,7 @@ class AllocatorExt : public Allocator {
   }
 };
 
-#ifdef ESP32
+#if defined(ESP32) && defined(ARDUINO)
 
 /**
  * @brief Memory allocateator which uses ps_malloc to allocate the memory in

src/utils/Buffers.h

@@ -6,7 +6,8 @@
 #include "utils/Vector.h"
 
 #ifndef MIN
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
+#  define MIN(a,b) (((a)<(b))?(a):(b))
+#  define MAX(a,b) (((a)>(b))?(a):(b))
 #endif
 
 
@@ -214,7 +215,7 @@ class SingleBuffer : public BaseBuffer<T> {
 
   int available() override {
     int result = current_write_pos - current_read_pos;
-    return max(result, 0);
+    return MAX(result, 0);
   }
 
   int availableForWrite() override { return max_size - current_write_pos; }
@@ -258,7 +259,7 @@ class SingleBuffer : public BaseBuffer<T> {
   /// If we load values directly into the address we need to set the avialeble
   /// size
   size_t setAvailable(size_t available_size) {
-    size_t result = min(available_size, (size_t) max_size);
+    size_t result = MIN(available_size, (size_t) max_size);
     current_read_pos = 0;
     current_write_pos = result;
     return result;