Merge branch 'pschatzmann:main' into main

roleroz · web-flow · commit 9b2e81db38ac · 2023-05-04T23:14:41.000-07:00
diff --git a/examples/output_aac/output_aac.ino b/examples/output_aac/output_aac.ino
@@ -5,37 +5,39 @@
  * @brief We just display the decoded audio data on the serial monitor
  * @version 0.1
  * @date 2021-07-18
- * 
+ *
  * @copyright Copyright (c) 2021
- * 
+ *
  */
 #include "AACDecoderHelix.h"
 #include "BabyElephantWalk60_aac.h"
 
 using namespace libhelix;
 
-void dataCallback(AACFrameInfo &info, int16_t *pcm_buffer, size_t len) {
-    for (size_t i=0; i<len; i+=info.nChans){
-        for (int j=0;j<info.nChans;j++){
-            Serial.print(pcm_buffer[i+j]);
-            Serial.print(" ");
-        }
-        Serial.println();
+AACDecoderHelix aac;
+
+void dataCallback(AACFrameInfo &info, int16_t *pcm_buffer, size_t len,
+                  void *ref) {
+  for (size_t i = 0; i < len; i += info.nChans) {
+    for (int j = 0; j < info.nChans; j++) {
+      Serial.print(pcm_buffer[i + j]);
+      Serial.print(" ");
     }
+    Serial.println();
+  }
 }
 
-AACDecoderHelix aac(dataCallback);
-
 void setup() {
-    Serial.begin(115200);
-    aac.begin();
+  Serial.begin(115200);
+  aac.setDataCallback(dataCallback);
+  aac.begin();
 }
 
 void loop() {
-    Serial.println("writing...");
-    aac.write(BabyElephantWalk60_aac, BabyElephantWalk60_aac_len);    
+  Serial.println("writing...");
+  aac.write(BabyElephantWalk60_aac, BabyElephantWalk60_aac_len);
 
-    // restart from the beginning
-    delay(2000);
-    aac.begin();
+  // restart from the beginning
+  delay(2000);
+  aac.begin();
 }
diff --git a/examples/output_mp3/output_mp3.ino b/examples/output_mp3/output_mp3.ino
@@ -13,7 +13,10 @@
 
 using namespace libhelix;
 
-void dataCallback(MP3FrameInfo &info, int16_t *pcm_buffer, size_t len) {
+MP3DecoderHelix mp3;
+
+
+void dataCallback(MP3FrameInfo &info, int16_t *pcm_buffer, size_t len, void* ref) {
     for (size_t i=0; i<len; i+=info.nChans){
         for (int j=0;j<info.nChans;j++){
             Serial.print(pcm_buffer[i+j]);
@@ -23,10 +26,9 @@ void dataCallback(MP3FrameInfo &info, int16_t *pcm_buffer, size_t len) {
     }
 }
 
-MP3DecoderHelix mp3(dataCallback);
-
 void setup() {
     Serial.begin(115200);
+    mp3.setDataCallback(dataCallback);
     mp3.begin();
 }
 
diff --git a/src/AACDecoderHelix.h b/src/AACDecoderHelix.h
@@ -8,8 +8,8 @@
 
 namespace libhelix {
 
-typedef void (*AACInfoCallback)(_AACFrameInfo &info);
-typedef void (*AACDataCallback)(_AACFrameInfo &info,short *pcm_buffer, size_t len);
+typedef void (*AACInfoCallback)(_AACFrameInfo &info, void* caller);
+typedef void (*AACDataCallback)(_AACFrameInfo &info,short *pcm_buffer, size_t len, void* caller);
 
 /**
  * @brief A simple Arduino API for the libhelix AAC decoder. The data us provided with the help of write() calls.
@@ -22,9 +22,8 @@ class AACDecoderHelix : public CommonHelix {
         AACDecoderHelix() = default;
 
 #ifdef ARDUINO
-        AACDecoderHelix(Print &output, AACInfoCallback infoCallback=nullptr){
+        AACDecoderHelix(Print &output){
             this->out = &output;
-            this->infoCallback = infoCallback;
         }
 #endif
         AACDecoderHelix(AACDataCallback dataCallback){
@@ -35,9 +34,9 @@ class AACDecoderHelix : public CommonHelix {
             end();
         }
 
-
-        void setInfoCallback(AACInfoCallback cb){
+        void setInfoCallback(AACInfoCallback cb, void* caller=nullptr){
             this->infoCallback = cb;
+            p_caller_info = caller;
         }
 
         void setDataCallback(AACDataCallback cb){
@@ -75,6 +74,8 @@ class AACDecoderHelix : public CommonHelix {
         AACDataCallback pcmCallback = nullptr;
         AACInfoCallback infoCallback = nullptr;
         _AACFrameInfo aacFrameInfo;
+        void *p_caller_info = nullptr;
+        void *p_caller_data = nullptr;
 
         /// Allocate the decoder
         virtual void allocateDecoder() override {
@@ -140,11 +141,11 @@ class AACDecoderHelix : public CommonHelix {
             // provide result
                 if(pcmCallback!=nullptr){
                     // output via callback
-                    pcmCallback(info, pcm_buffer,info.outputSamps);
+                    pcmCallback(info, pcm_buffer,info.outputSamps, p_caller_data);
                 } else {
                     // output to stream
                     if (info.sampRateOut!=aacFrameInfo.sampRateOut && infoCallback!=nullptr){
-                        infoCallback(info);
+                        infoCallback(info, p_caller_info);
                     }
 #ifdef ARDUINO
                     int sampleSize = info.bitsPerSample / 8;
diff --git a/src/CommonHelix.h b/src/CommonHelix.h
@@ -1,21 +1,20 @@
 #pragma once
 
 #ifdef ARDUINO
-#include "Arduino.h"
+#  include "Arduino.h"
 #else
-// remove yield statment if used outside of arduino
-#define yield()
-//#define delay(ms)
-#include <stdint.h>
+// remove delay statment if used outside of arduino
+#  include <stdint.h>
+#  define delay(ms)
 #endif
 
 // Not all processors support assert
 #ifndef assert
-#ifdef NDEBUG 
+# ifdef NDEBUG 
 #  define assert(condition) ((void)0)
-#else
+# else
 #  define assert(condition) /*implementation defined*/
-#endif
+# endif
 #endif
 
 #include "helix_log.h"
diff --git a/src/MP3DecoderHelix.h b/src/MP3DecoderHelix.h
@@ -10,8 +10,8 @@
 namespace libhelix {
 
 
-typedef void (*MP3InfoCallback)(MP3FrameInfo &info);
-typedef void (*MP3DataCallback)(MP3FrameInfo &info,short *pcm_buffer, size_t len);
+typedef void (*MP3InfoCallback)(MP3FrameInfo &info, void* caller);
+typedef void (*MP3DataCallback)(MP3FrameInfo &info,short *pcm_buffer, size_t len, void* caller);
 
 enum MP3Type {MP3Normal=0, MP3SelfContaind=1};
 
@@ -30,9 +30,8 @@ class MP3DecoderHelix : public CommonHelix {
         }
 
 #ifdef ARDUINO
-        MP3DecoderHelix(Print &output, MP3Type mp3Type=MP3Normal, MP3InfoCallback infoCallback=nullptr){
+        MP3DecoderHelix(Print &output, MP3Type mp3Type=MP3Normal){
             this->out = &output;
-            this->infoCallback = infoCallback;
             this->mp3_type = mp3Type;
         }
 #endif
@@ -49,8 +48,9 @@ class MP3DecoderHelix : public CommonHelix {
             end();
         }
 
-        void setInfoCallback(MP3InfoCallback cb){
+        void setInfoCallback(MP3InfoCallback cb, void* caller=nullptr){
             this->infoCallback = cb;
+            p_caller_info = caller;
         }
 
         void setDataCallback(MP3DataCallback cb){
@@ -91,6 +91,8 @@ class MP3DecoderHelix : public CommonHelix {
         MP3InfoCallback infoCallback = nullptr;
         MP3Type mp3_type;
         MP3FrameInfo mp3FrameInfo;
+        void *p_caller_info = nullptr;
+        void *p_caller_data = nullptr;
 
         /// Allocate the decoder
         virtual void allocateDecoder() override {
@@ -161,11 +163,11 @@ class MP3DecoderHelix : public CommonHelix {
                 // provide result
                 if(pcmCallback!=nullptr){
                     // output via callback
-                    pcmCallback(info, pcm_buffer, info.outputSamps);
+                    pcmCallback(info, pcm_buffer, info.outputSamps, p_caller_data);
                 } else {
                     // output to stream
                     if (info.samprate!=mp3FrameInfo.samprate  && infoCallback!=nullptr){
-                        infoCallback(info);
+                        infoCallback(info, p_caller_info);
                     }
 #ifdef ARDUINO
                     int sampleSize = info.bitsPerSample / 8;

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,10 @@`
`13`	`13`
`14`	`14`	`using namespace libhelix;`
`15`	`15`
`16`		`-void dataCallback(MP3FrameInfo &info, int16_t *pcm_buffer, size_t len) {`
	`16`	`+MP3DecoderHelix mp3;`
	`17`	`+`
	`18`	`+`
	`19`	`+void dataCallback(MP3FrameInfo &info, int16_t pcm_buffer, size_t len, void ref) {`
`17`	`20`	`for (size_t i=0; i<len; i+=info.nChans){`
`18`	`21`	`for (int j=0;j<info.nChans;j++){`
`19`	`22`	`Serial.print(pcm_buffer[i+j]);`
`@@ -23,10 +26,9 @@ void dataCallback(MP3FrameInfo &info, int16_t *pcm_buffer, size_t len) {`
`23`	`26`	`}`
`24`	`27`	`}`
`25`	`28`
`26`		`-MP3DecoderHelix mp3(dataCallback);`
`27`		`-`
`28`	`29`	`void setup() {`
`29`	`30`	`Serial.begin(115200);`
	`31`	`+ mp3.setDataCallback(dataCallback);`
`30`	`32`	`mp3.begin();`
`31`	`33`	`}`
`32`	`34`