handle assert errors in libhelix

Author: pschatzmann

src/AACDecoderHelix.h

@@ -102,24 +102,28 @@ class AACDecoderHelix : public CommonHelix {
                 provideResult(info);
 
                 // remove processed data from buffer 
-                buffer_size -= decoded;
-                assert(buffer_size<=maxFrameSize());
-                memmove(frame_buffer, frame_buffer+r.start+decoded, buffer_size);
-                LOG(Debug, " -> decoded %d bytes - remaining buffer_size: %d", decoded, buffer_size);
+                if (decoded<=buffer_size) {
+                    buffer_size -= decoded;
+                    //assert(buffer_size<=maxFrameSize());
+                    memmove(frame_buffer, frame_buffer+r.start+decoded, buffer_size);
+                    LOG(Debug, " -> decoded %d bytes - remaining buffer_size: %d", decoded, buffer_size);
+                } else {
+                    LOG(Warning, " -> decoded %d > buffersize %d", decoded, buffer_size);
+                    buffer_size = 0;
+                }
             } else {
+                // decoding error
                 LOG(Debug, " -> decode error: %d - removing frame!", result);
-                
-                int ignore = decoded > 0 ? decoded : r.end;
-                if (ignore>buffer_size){
-                    buffer_size = 0;
-                } else {
+                int ignore = decoded;
+                if (ignore == 0) ignore = r.end;
+                // We advance to the next synch world
+                if (ignore<=buffer_size){
                     buffer_size -= ignore;
+                    memmove(frame_buffer, frame_buffer+ignore, buffer_size);
+                }  else {
+                    buffer_size = 0;
                 }
-                // We advance to the next synch world
-                assert(buffer_size<=maxFrameSize());
-                if (buffer_size>0) {
-                	memmove(frame_buffer, frame_buffer+ignore, buffer_size);
-                }            
+
             }
         }
 

src/CommonHelix.h

@@ -33,6 +33,9 @@ namespace libhelix {
 struct Range {
     int start;
     int end;
+    bool isValid(uint32_t max) {
+        return start>=0 && end>start && (end - start)<=max;
+    }
 };
 
 /**
@@ -119,7 +122,7 @@ class CommonHelix   {
                     yield();
                 }
             } else {
-                LOG(Warn, "CommonHelix not active");
+                LOG(Warning, "CommonHelix not active");
             }
 
             return start;
@@ -173,7 +176,7 @@ class CommonHelix   {
             memmove(frame_buffer+buffer_size, in_ptr, process_size); 
             buffer_size += process_size;
             if (buffer_size>maxFrameSize()){
-                LOG(Error "Increase MAX_FRAME_SIZE > %ld", buffer_size);
+                LOG(Error, "Increase MAX_FRAME_SIZE > %ld", buffer_size);
             }
             assert(buffer_size<=maxFrameSize());
 
@@ -189,15 +192,17 @@ class CommonHelix   {
             result = appendToBuffer(in_ptr, in_size);
             Range r = synchronizeFrame();
             // Decode if we have a valid start and end synch word
-            if(r.start>=0 && r.end>r.start){
+            if(r.isValid(maxFrameSize())){
                 decode(r);
-            } 
+            } else {
+                LOG(Warning, " -> invalid frame size: %d / max: %d", (int) r.end-r.start, (int) maxFrameSize());
+            }
             yield();
             frame_counter++;
             return result;
         }
 
-        /// returns true if we have a valid start and end synch word.
+        /// returns valid start and end synch word.
         Range synchronizeFrame() {
             LOG(Debug, "synchronizeFrame");
             Range range = frameRange();

src/MP3DecoderHelix.h

@@ -5,8 +5,7 @@
 #include "libhelix-mp3/mp3common.h"
 
 #define MP3_MAX_OUTPUT_SIZE 1024 * 2
-//#define MP3_MAX_FRAME_SIZE 1600 
-#define MP3_MAX_FRAME_SIZE 10000 
+#define MP3_MAX_FRAME_SIZE 1600 
 
 namespace libhelix {
 
@@ -112,21 +111,28 @@ class MP3DecoderHelix : public CommonHelix {
                 provideResult(info);
 
                 // remove processed data from buffer 
-                buffer_size -= decoded;
-                assert(buffer_size<=maxFrameSize());
-
-                memmove(frame_buffer, frame_buffer+r.start+decoded, buffer_size);
-                LOG(Debug, " -> decoded %d bytes - remaining buffer_size: %d", decoded, buffer_size);
+                if (decoded<=buffer_size) {
+                    buffer_size -= decoded;
+                    //assert(buffer_size<=maxFrameSize());
+                    memmove(frame_buffer, frame_buffer+r.start+decoded, buffer_size);
+                    LOG(Debug, " -> decoded %d bytes - remaining buffer_size: %d", decoded, buffer_size);
+                } else {
+                    LOG(Warning, " -> decoded %d > buffersize %d", decoded, buffer_size);
+                    buffer_size = 0;
+                }
             } else {
                 // decoding error
                 LOG(Debug, " -> decode error: %d - removing frame!", result);
                 int ignore = decoded;
                 if (ignore == 0) ignore = r.end;
                 // We advance to the next synch world
-                buffer_size -= ignore;
-                assert(buffer_size<=maxFrameSize());
+                if (ignore<=buffer_size){
+                    buffer_size -= ignore;
+                    memmove(frame_buffer, frame_buffer+ignore, buffer_size);
+                }  else {
+                    buffer_size = 0;
+                }
 
-                memmove(frame_buffer, frame_buffer+ignore, buffer_size);
             }
         }
 

src/helix_log.h

@@ -2,20 +2,25 @@
 
 // User Settings: Activate/Deactivate logging
 #ifndef HELIX_LOGGING_ACTIVE
-#define HELIX_LOGGING_ACTIVE false
+    #define HELIX_LOGGING_ACTIVE true
 #endif
+
 #ifndef HELIX_LOG_LEVEL
-#define HELIX_LOG_LEVEL Debug
+    #define HELIX_LOG_LEVEL Warning
+#endif
+
+#ifndef HELIX_LOGGING_OUT
+    #define HELIX_LOGGING_OUT Serial
 #endif
 
 // Logging Implementation
 #if HELIX_LOGGING_ACTIVE == true
-static char log_buffer[512];
-enum LogLevel {Debug, Info, Warning, Error};
-static LogLevel minLogLevel = Debug;
-// We print the log based on the log level
-#define LOG(level,...) { if(level>=minLogLevel) { int l = snprintf(log_buffer,512, __VA_ARGS__);  Serial.write(log_buffer,l); Serial.println(); } }
+    static char log_buffer[512];
+    enum LogLevel {Debug, Info, Warning, Error};
+    static LogLevel minLogLevel = HELIX_LOG_LEVEL;
+    // We print the log based on the log level
+    #define LOG(level,...) { if(level>=minLogLevel) { int l = snprintf(log_buffer,512, __VA_ARGS__); HELIX_LOGGING_OUT.write("libhelix - "); HELIX_LOGGING_OUT.write(log_buffer,l); HELIX_LOGGING_OUT.println(); } }
 #else
-// Remove all log statments from the code
-#define LOG(...) 
+    // Remove all log statments from the code
+    #define LOG(...) 
 #endif