Make sure we don't accidentally overflow the output FIFO when transmi…

…tting EOO.
drowe67 · Dec 4, 2024 · e2a1e58 · e2a1e58
1 parent f8b647c
commit e2a1e58
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/cmake/BuildRADE.cmake b/cmake/BuildRADE.cmake
@@ -13,7 +13,7 @@ ExternalProject_Add(build_rade
    SOURCE_DIR rade_src
    BINARY_DIR rade_build
    GIT_REPOSITORY https://github.com/drowe67/radae.git
-   GIT_TAG dr-cport
+   GIT_TAG dr-timing-bug
    CMAKE_ARGS ${RADE_CMAKE_ARGS}
    #CMAKE_CACHE_ARGS -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
    INSTALL_COMMAND ""

diff --git a/src/pipeline/RADETransmitStep.cpp b/src/pipeline/RADETransmitStep.cpp
@@ -80,6 +80,21 @@ std::shared_ptr<short> RADETransmitStep::execute(std::shared_ptr<short> inputSam
 {
     short* outputSamples = nullptr;
     *numOutputSamples = 0;
+
+    if (numInputSamples == 0)
+    {
+        // Special case logic for EOO -- make sure we only send 20ms worth at a time
+        *numOutputSamples = std::min(codec2_fifo_used(outputSampleFifo_), (int)(8000*.02));
+        if (*numOutputSamples > 0)
+        {
+            outputSamples = new short[*numOutputSamples];
+            assert(outputSamples != nullptr);
+
+            codec2_fifo_read(outputSampleFifo_, outputSamples, *numOutputSamples);
+        }
+
+        return std::shared_ptr<short>(outputSamples, std::default_delete<short[]>());;
+    }
 
     short* inputPtr = inputSamples.get();
     while (numInputSamples > 0 && inputPtr != nullptr)

diff --git a/src/pipeline/TxRxThread.cpp b/src/pipeline/TxRxThread.cpp
@@ -651,24 +651,25 @@ void TxRxThread::txProcessing_()
             int nread = codec2_fifo_read(cbData->infifo2, insound_card, nsam_in_48);            
             if (nread != 0 && endingTx)
             {
-                if (freedvInterface.getCurrentMode() >= FREEDV_MODE_RADE && !hasEooBeenSent_)
+                if (freedvInterface.getCurrentMode() >= FREEDV_MODE_RADE)
                 {
-                    log_info("Triggering sending of EOO");
-
-                    // Special case for handling RADE EOT
-                    freedvInterface.restartTxVocoder();
-                    hasEooBeenSent_ = true;
+                    if (!hasEooBeenSent_)
+                    {
+                        log_info("Triggering sending of EOO");
+
+                        // Special case for handling RADE EOT
+                        freedvInterface.restartTxVocoder();
+                        hasEooBeenSent_ = true;
+                    }
 
                     short* inputSamples = new short[1];
                     auto inputSamplesPtr = std::shared_ptr<short>(inputSamples, std::default_delete<short[]>());
-                    do
+                    auto outputSamples = pipeline_->execute(inputSamplesPtr, 0, &nout);
+                    if (nout > 0 && outputSamples.get() != nullptr)
                     {
-                        auto outputSamples = pipeline_->execute(inputSamplesPtr, 0, &nout);
-                        if (nout > 0 && outputSamples.get() != nullptr)
-                        {
-                            codec2_fifo_write(cbData->outfifo1, outputSamples.get(), nout);
-                        }
-                    } while (nout > 0);
+                        log_info("Injecting %d samples of EOO into TX stream", nout);
+                        codec2_fifo_write(cbData->outfifo1, outputSamples.get(), nout);
+                    }
                 }
                 break;
             }