From d1bd6ee7ebcd68649d11afd3febebd39444c5ea0 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 23 Jul 2019 03:22:35 +0200
Subject: [PATCH] AMBE processing: handle the case where the decoder is too
 slow

---
 sdrbase/ambe/ambeworker.cpp   | 45 ++++++++++++++++++++++++-----------
 sdrbase/util/messagequeue.cpp |  5 +++-
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/sdrbase/ambe/ambeworker.cpp b/sdrbase/ambe/ambeworker.cpp
index 233b6bf41..37713daba 100644
--- a/sdrbase/ambe/ambeworker.cpp
+++ b/sdrbase/ambe/ambeworker.cpp
@@ -108,6 +108,17 @@ void AMBEWorker::handleInputMessages()
                 }
 
                 audioFifo = decodeMsg->getAudioFifo();
+
+                if (audioFifo && (m_audioBufferFill >= m_audioBuffer.size() - 960))
+                {
+                    uint res = audioFifo->write((const quint8*)&m_audioBuffer[0], m_audioBufferFill);
+
+                    if (res != m_audioBufferFill) {
+                        qDebug("AMBEWorker::handleInputMessages: %u/%u audio samples written", res, m_audioBufferFill);
+                    }
+
+                    m_audioBufferFill = 0;
+                }
             }
             else
             {
@@ -116,16 +127,24 @@ void AMBEWorker::handleInputMessages()
         }
 
         delete message;
+
+        if (m_inputMessageQueue.size() > 100)
+        {
+            qDebug("AMBEWorker::handleInputMessages: MsgMbeDecode: too many messages in queue. Flushing...");
+            m_inputMessageQueue.clear();
+            break;
+        }
     }
 
     if (audioFifo)
     {
         uint res = audioFifo->write((const quint8*)&m_audioBuffer[0], m_audioBufferFill);
 
-        if (res != m_audioBufferFill)
-        {
+        if (res != m_audioBufferFill) {
             qDebug("AMBEWorker::handleInputMessages: %u/%u audio samples written", res, m_audioBufferFill);
         }
+
+        m_audioBufferFill = 0;
     }
 
     m_timestamp = QDateTime::currentDateTime();
@@ -172,18 +191,17 @@ void AMBEWorker::upsample(int upsampling, short *in, int nbSamplesIn, unsigned c
             m_audioBuffer[m_audioBufferFill].l = channels & 1 ? m_compressor.compress(upsample) : 0;
             m_audioBuffer[m_audioBufferFill].r = (channels>>1) & 1 ? m_compressor.compress(upsample) : 0;
 
-            if (m_audioBufferFill < m_audioBuffer.size() - 1)
-            {
+            if (m_audioBufferFill < m_audioBuffer.size() - 1) {
                 ++m_audioBufferFill;
             }
-            else
-            {
-                qDebug("AMBEWorker::upsample6: audio buffer is full check its size");
-            }
         }
 
         m_upsamplerLastValue = cur;
     }
+
+    if (m_audioBufferFill >= m_audioBuffer.size() - 1) {
+        qDebug("AMBEWorker::upsample(%d): audio buffer is full check its size", upsampling);
+    }
 }
 
 void AMBEWorker::noUpsample(short *in, int nbSamplesIn, unsigned char channels)
@@ -194,14 +212,13 @@ void AMBEWorker::noUpsample(short *in, int nbSamplesIn, unsigned char channels)
         m_audioBuffer[m_audioBufferFill].l = channels & 1 ? cur*m_upsamplingFactors[0] : 0;
         m_audioBuffer[m_audioBufferFill].r = (channels>>1) & 1 ? cur*m_upsamplingFactors[0] : 0;
 
-        if (m_audioBufferFill < m_audioBuffer.size() - 1)
-        {
+        if (m_audioBufferFill < m_audioBuffer.size() - 1) {
             ++m_audioBufferFill;
         }
-        else
-        {
-            qDebug("AMBEWorker::noUpsample: audio buffer is full check its size");
-        }
+    }
+
+    if (m_audioBufferFill >= m_audioBuffer.size() - 1) {
+        qDebug("AMBEWorker::noUpsample: audio buffer is full check its size");
     }
 }
 
diff --git a/sdrbase/util/messagequeue.cpp b/sdrbase/util/messagequeue.cpp
index 3c6e5743b..28e22404f 100644
--- a/sdrbase/util/messagequeue.cpp
+++ b/sdrbase/util/messagequeue.cpp
@@ -78,5 +78,8 @@ int MessageQueue::size()
 void MessageQueue::clear()
 {
 	QMutexLocker locker(&m_lock);
-	m_queue.clear();
+
+    while (!m_queue.isEmpty()) {
+        delete m_queue.takeFirst();
+    }
 }