A2DP check allocation

Author: pschatzmann

src/AudioLibs/A2DPStream.h

@@ -132,7 +132,11 @@ class A2DPStream : public AudioStream, public VolumeSupport {
             this->config = cfg;
             bool result = false;
             LOGI("Connecting to %s",cfg.name);
-            a2dp_buffer.resize(cfg.buffer_size);
+            
+            if (!a2dp_buffer.resize(cfg.buffer_size)){
+                LOGE("a2dp_buffer resize failed");
+                return false;
+            }
 
             // initialize a2dp_silence_timeout
             if (config.silence_on_nodata){
@@ -224,9 +228,11 @@ class A2DPStream : public AudioStream, public VolumeSupport {
                 }
 
                 // blocking write: if buffer is full we wait
-                while(len > 0.9f * a2dp_buffer.availableForWrite() * 100 / 90){
-                    LOGD("Waiting for buffer to be available");
+                size_t free = a2dp_buffer.availableForWrite();
+                while(len > free){
+                    LOGD("Waiting for buffer to be available: %d < %d", (int) len, (int) free);
                     delay(5);
+                    free = a2dp_buffer.availableForWrite();
                 }
             }
 

src/Concurrency/BufferRTOS.h

@@ -47,12 +47,14 @@ class BufferRTOS : public BaseBuffer<T> {
   ~BufferRTOS() { end(); }
 
   /// Re-Allocats the memory and the queue
-  void resize(size_t size) {
+  bool resize(size_t size) {
+    bool result = true;
     if (current_size != size) {
       end();
       current_size = size;
-      setup();
+      result = setup();
     }
+    return result;
   }
 
   void setReadMaxWait(TickType_t ticks) { readWait = ticks; }
@@ -167,17 +169,26 @@ class BufferRTOS : public BaseBuffer<T> {
     if (current_size == 0) return true;
 
     // allocate data if necessary
+    int size = (current_size + 1) * sizeof(T);
     if (p_data == nullptr) {
-      p_data = (uint8_t *)p_allocator->allocate((current_size + 1) * sizeof(T));
+      p_data = (uint8_t *)p_allocator->allocate(size);
+      // check allocation
+      if (p_data == nullptr) {
+        LOGE("allocate falied for %d bytes", size)
+        return false;
+      }
     }
-    if (p_data == nullptr) return false;
+
 
     // create stream buffer if necessary
     if (xStreamBuffer == nullptr) {
       xStreamBuffer = xStreamBufferCreateStatic(current_size, trigger_level,
                                                 p_data, &static_stream_buffer);
     }
-    if (xStreamBuffer == nullptr) return false;
+    if (xStreamBuffer == nullptr) {
+      LOGE("xStreamBufferCreateStatic failed");
+      return false;
+    }
     // make sure that the data is empty
     reset();
     return true;