Add additional guarding around Codec2 FIFO calls.

tmiw · tmiw · commit 9ed288696713 · 2024-10-14T17:54:23.000-07:00
diff --git a/src/pipeline/FreeDVReceiveStep.cpp b/src/pipeline/FreeDVReceiveStep.cpp
@@ -73,7 +73,7 @@ std::shared_ptr<short> FreeDVReceiveStep::execute(std::shared_ptr<short> inputSa
     COMP  rx_fdm_offset[freedv_get_n_max_modem_samples(dv_)];
     
     short* inputPtr = inputSamples.get();
-    while (numInputSamples > 0)
+    while (numInputSamples > 0 && inputPtr != nullptr)
     {
         codec2_fifo_write(inputSampleFifo_, inputPtr++, 1);
         numInputSamples--;
diff --git a/src/pipeline/FreeDVTransmitStep.cpp b/src/pipeline/FreeDVTransmitStep.cpp
@@ -71,7 +71,7 @@ std::shared_ptr<short> FreeDVTransmitStep::execute(std::shared_ptr<short> inputS
     *numOutputSamples = 0;
     
     short* inputPtr = inputSamples.get();
-    while (numInputSamples > 0)
+    while (numInputSamples > 0 && inputPtr)
     {
         codec2_fifo_write(inputSampleFifo_, inputPtr++, 1);
         numInputSamples--;
@@ -116,60 +116,4 @@ std::shared_ptr<short> FreeDVTransmitStep::execute(std::shared_ptr<short> inputS
     }
     
     return std::shared_ptr<short>(outputSamples, std::default_delete<short[]>());
-#if 0
-    short* outputSamples = nullptr;
-
-    int mode = freedv_get_mode(dv_);
-    int samplesUsedForFifo = freedv_get_n_speech_samples(dv_);
-    int numTransmitRuns = (codec2_fifo_used(inputSampleFifo_) + numInputSamples) / samplesUsedForFifo;
-    int nfreedv = freedv_get_n_nom_modem_samples(dv_);
-    
-    if (numTransmitRuns)
-    {
-        *numOutputSamples = freedv_get_n_nom_modem_samples(dv_) * numTransmitRuns;
-        outputSamples = new short[*numOutputSamples];
-        assert(outputSamples != nullptr);
-        
-        short codecInput[samplesUsedForFifo];
-        short* tmpOutput = outputSamples;
-        short* tmpInput = inputSamples.get();
-        
-        while (numInputSamples > 0)
-        {
-            codec2_fifo_write(inputSampleFifo_, tmpInput++, 1);
-            numInputSamples--;
-            
-            if (codec2_fifo_used(inputSampleFifo_) >= samplesUsedForFifo)
-            {
-                codec2_fifo_read(inputSampleFifo_, codecInput, samplesUsedForFifo);
-                
-                if (mode == FREEDV_MODE_800XA) 
-                {
-                    /* 800XA doesn't support complex output just yet */
-                    freedv_tx(dv_, tmpOutput, codecInput);
-                }
-                else 
-                {
-                    COMP tx_fdm[nfreedv];
-                    COMP tx_fdm_offset[nfreedv];
-                    
-                    freedv_comptx(dv_, tx_fdm, codecInput);
-                    
-                    freq_shift_coh(tx_fdm_offset, tx_fdm, getFreqOffsetFn_(), getOutputSampleRate(), &txFreqOffsetPhaseRectObj_, nfreedv);
-                    for(int i = 0; i<nfreedv; i++)
-                        tmpOutput[i] = tx_fdm_offset[i].real;
-                }
-                
-                tmpOutput += samplesUsedForFifo;
-            }
-        }
-    }
-    else
-    {
-        codec2_fifo_write(inputSampleFifo_, inputSamples.get(), numInputSamples);
-        *numOutputSamples = 0;
-    }
-
-    return std::shared_ptr<short>(outputSamples, std::default_delete<short[]>());
-#endif
 }
diff --git a/src/pipeline/LinkStep.cpp b/src/pipeline/LinkStep.cpp
@@ -53,9 +53,10 @@ void LinkStep::clearFifo()
 std::shared_ptr<short> LinkStep::InputStep::execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples)
 {
     auto fifo = parent_->getFifo();
-    if (numInputSamples > 0)
+    auto samplePtr = inputSamples.get();
+    if (numInputSamples > 0 && samplePtr != nullptr)
     {
-        codec2_fifo_write(fifo, inputSamples.get(), numInputSamples);
+        codec2_fifo_write(fifo, samplePtr, numInputSamples);
     }
 
     // Since we short circuited to the output step, don't return any samples here.
diff --git a/src/pipeline/RADEReceiveStep.cpp b/src/pipeline/RADEReceiveStep.cpp
@@ -73,7 +73,7 @@ std::shared_ptr<short> RADEReceiveStep::execute(std::shared_ptr<short> inputSamp
     float features_out[rade_n_features_in_out(dv_)];
     
     short* inputPtr = inputSamples.get();
-    while (numInputSamples > 0)
+    while (numInputSamples > 0 && inputPtr != nullptr)
     {
         codec2_fifo_write(inputSampleFifo_, inputPtr++, 1);
         numInputSamples--;
diff --git a/src/pipeline/RADETransmitStep.cpp b/src/pipeline/RADETransmitStep.cpp
@@ -67,7 +67,7 @@ std::shared_ptr<short> RADETransmitStep::execute(std::shared_ptr<short> inputSam
     *numOutputSamples = 0;
     
     short* inputPtr = inputSamples.get();
-    while (numInputSamples > 0)
+    while (numInputSamples > 0 && inputPtr != nullptr)
     {
         codec2_fifo_write(inputSampleFifo_, inputPtr++, 1);
         numInputSamples--;
diff --git a/src/pipeline/SpeexStep.cpp b/src/pipeline/SpeexStep.cpp
@@ -62,6 +62,7 @@ int SpeexStep::getOutputSampleRate() const
 std::shared_ptr<short> SpeexStep::execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples)
 {
     short* outputSamples = nullptr;
+    *numOutputSamples = 0;
     
     int numSpeexRuns = (codec2_fifo_used(inputSampleFifo_) + numInputSamples) / numSamplesPerSpeexRun_;
     if (numSpeexRuns > 0)
@@ -73,7 +74,7 @@ std::shared_ptr<short> SpeexStep::execute(std::shared_ptr<short> inputSamples, i
         short* tmpOutput = outputSamples;
         short* tmpInput = inputSamples.get();
         
-        while (numInputSamples > 0)
+        while (numInputSamples > 0 && tmpInput != nullptr)
         {
             codec2_fifo_write(inputSampleFifo_, tmpInput++, 1);
             numInputSamples--;
@@ -86,10 +87,9 @@ std::shared_ptr<short> SpeexStep::execute(std::shared_ptr<short> inputSamples, i
             }
         }
     }
-    else
+    else if (numInputSamples > 0 && inputSamples.get() != nullptr)
     {
         codec2_fifo_write(inputSampleFifo_, inputSamples.get(), numInputSamples);
-        *numOutputSamples = 0;
     }
     
     return std::shared_ptr<short>(outputSamples, std::default_delete<short[]>());
diff --git a/src/pipeline/TxRxThread.cpp b/src/pipeline/TxRxThread.cpp
@@ -646,7 +646,7 @@ void TxRxThread::txProcessing_()
                     do
                     {
                         auto outputSamples = pipeline_->execute(inputSamplesPtr, 0, &nout);
-                        if (nout > 0)
+                        if (nout > 0 && outputSamples.get() != nullptr)
                         {
                             codec2_fifo_write(cbData->outfifo1, outputSamples.get(), nout);
                         }
@@ -665,7 +665,10 @@ void TxRxThread::txProcessing_()
                 fprintf(stderr, "  nout: %d\n", nout);
             }
             
-            codec2_fifo_write(cbData->outfifo1, outputSamples.get(), nout);
+            if (outputSamples.get() != nullptr)
+            {
+                codec2_fifo_write(cbData->outfifo1, outputSamples.get(), nout);
+            }
         }
         
         txModeChangeMutex.Unlock();
@@ -734,7 +737,7 @@ void TxRxThread::rxProcessing_()
         auto outputSamples = pipeline_->execute(inputSamplesPtr, nsam, &nout);
         auto outFifo = (g_nSoundCards == 1) ? cbData->outfifo1 : cbData->outfifo2;
         
-        if (nout > 0)
+        if (nout > 0 && outputSamples.get() != nullptr)
         {
             codec2_fifo_write(outFifo, outputSamples.get(), nout);
         }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ std::shared_ptr<short> FreeDVReceiveStep::execute(std::shared_ptr<short> inputSa`
`73`	`73`	`COMP rx_fdm_offset[freedv_get_n_max_modem_samples(dv_)];`
`74`	`74`
`75`	`75`	`short* inputPtr = inputSamples.get();`
`76`		`- while (numInputSamples > 0)`
	`76`	`+ while (numInputSamples > 0 && inputPtr != nullptr)`
`77`	`77`	`{`
`78`	`78`	`codec2_fifo_write(inputSampleFifo_, inputPtr++, 1);`
`79`	`79`	`numInputSamples--;`
Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,10 @@ void LinkStep::clearFifo()`
`53`	`53`	`std::shared_ptr<short> LinkStep::InputStep::execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples)`
`54`	`54`	`{`
`55`	`55`	`auto fifo = parent_->getFifo();`
`56`		`- if (numInputSamples > 0)`
	`56`	`+ auto samplePtr = inputSamples.get();`
	`57`	`+ if (numInputSamples > 0 && samplePtr != nullptr)`
`57`	`58`	`{`
`58`		`- codec2_fifo_write(fifo, inputSamples.get(), numInputSamples);`
	`59`	`+ codec2_fifo_write(fifo, samplePtr, numInputSamples);`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`// Since we short circuited to the output step, don't return any samples here.`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ std::shared_ptr<short> RADETransmitStep::execute(std::shared_ptr<short> inputSam`
`67`	`67`	`*numOutputSamples = 0;`
`68`	`68`
`69`	`69`	`short* inputPtr = inputSamples.get();`
`70`		`- while (numInputSamples > 0)`
	`70`	`+ while (numInputSamples > 0 && inputPtr != nullptr)`
`71`	`71`	`{`
`72`	`72`	`codec2_fifo_write(inputSampleFifo_, inputPtr++, 1);`
`73`	`73`	`numInputSamples--;`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ int SpeexStep::getOutputSampleRate() const`
`62`	`62`	`std::shared_ptr<short> SpeexStep::execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples)`
`63`	`63`	`{`
`64`	`64`	`short* outputSamples = nullptr;`
	`65`	`+ *numOutputSamples = 0;`
`65`	`66`
`66`	`67`	`int numSpeexRuns = (codec2_fifo_used(inputSampleFifo_) + numInputSamples) / numSamplesPerSpeexRun_;`
`67`	`68`	`if (numSpeexRuns > 0)`
`@@ -73,7 +74,7 @@ std::shared_ptr<short> SpeexStep::execute(std::shared_ptr<short> inputSamples, i`
`73`	`74`	`short* tmpOutput = outputSamples;`
`74`	`75`	`short* tmpInput = inputSamples.get();`
`75`	`76`
`76`		`- while (numInputSamples > 0)`
	`77`	`+ while (numInputSamples > 0 && tmpInput != nullptr)`
`77`	`78`	`{`
`78`	`79`	`codec2_fifo_write(inputSampleFifo_, tmpInput++, 1);`
`79`	`80`	`numInputSamples--;`
`@@ -86,10 +87,9 @@ std::shared_ptr<short> SpeexStep::execute(std::shared_ptr<short> inputSamples, i`
`86`	`87`	`}`
`87`	`88`	`}`
`88`	`89`	`}`
`89`		`- else`
	`90`	`+ else if (numInputSamples > 0 && inputSamples.get() != nullptr)`
`90`	`91`	`{`
`91`	`92`	`codec2_fifo_write(inputSampleFifo_, inputSamples.get(), numInputSamples);`
`92`		`- *numOutputSamples = 0;`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`return std::shared_ptr<short>(outputSamples, std::default_delete<short[]>());`
Original file line number	Diff line number	Diff line change
`@@ -646,7 +646,7 @@ void TxRxThread::txProcessing_()`
`646`	`646`	`do`
`647`	`647`	`{`
`648`	`648`	`auto outputSamples = pipeline_->execute(inputSamplesPtr, 0, &nout);`
`649`		`- if (nout > 0)`
	`649`	`+ if (nout > 0 && outputSamples.get() != nullptr)`
`650`	`650`	`{`
`651`	`651`	`codec2_fifo_write(cbData->outfifo1, outputSamples.get(), nout);`
`652`	`652`	`}`
`@@ -665,7 +665,10 @@ void TxRxThread::txProcessing_()`
`665`	`665`	`fprintf(stderr, " nout: %d\n", nout);`
`666`	`666`	`}`
`667`	`667`
`668`		`- codec2_fifo_write(cbData->outfifo1, outputSamples.get(), nout);`
	`668`	`+ if (outputSamples.get() != nullptr)`
	`669`	`+ {`
	`670`	`+ codec2_fifo_write(cbData->outfifo1, outputSamples.get(), nout);`
	`671`	`+ }`
`669`	`672`	`}`
`670`	`673`
`671`	`674`	`txModeChangeMutex.Unlock();`
`@@ -734,7 +737,7 @@ void TxRxThread::rxProcessing_()`
`734`	`737`	`auto outputSamples = pipeline_->execute(inputSamplesPtr, nsam, &nout);`
`735`	`738`	`auto outFifo = (g_nSoundCards == 1) ? cbData->outfifo1 : cbData->outfifo2;`
`736`	`739`
`737`		`- if (nout > 0)`
	`740`	`+ if (nout > 0 && outputSamples.get() != nullptr)`
`738`	`741`	`{`
`739`	`742`	`codec2_fifo_write(outFifo, outputSamples.get(), nout);`
`740`	`743`	`}`