SoundDeviceNetwork: Fix writing wrong number of silence after a long underrun

This happens due to samples vs. frames issue.

Author: daschuer

src/soundio/sounddevicenetwork.cpp

@@ -318,7 +318,7 @@ void SoundDeviceNetwork::workerWriteProcess(NetworkOutputStreamWorkerPtr pWorker
             //                 << "Catch up with silence:" << writeExpected - copyCount
             //                 << "streamTime" << pWorker->getStreamTimeFrames();;
             // catch up by filling buffer until we are synced
-            workerWriteSilence(pWorker, writeExpected - copyCount);
+            workerWriteSilence(pWorker, (writeExpected - copyCount) / m_numOutputChannels);
             m_pSoundManager->underflowHappened(24);
         } else if (writeExpected - copyCount > outChunkSize / 2) {
             // try to keep PAs buffer filled up to 0.5 chunks
@@ -327,7 +327,7 @@ void SoundDeviceNetwork::workerWriteProcess(NetworkOutputStreamWorkerPtr pWorker
                 // kLogger.debug() << "workerWriteProcess() duplicate one frame"
                 //                 << (float)writeExpected / outChunkSize
                 //                 << (float)readAvailable / outChunkSize;
-                workerWrite(pWorker, dataPtr1, m_numOutputChannels);
+                workerWrite(pWorker, dataPtr1, 1);
             } else {
                 pWorker->setOutputDrift(true);
             }
@@ -349,9 +349,9 @@ void SoundDeviceNetwork::workerWriteProcess(NetworkOutputStreamWorkerPtr pWorker
             pWorker->setOutputDrift(false);
         }
 
-        workerWrite(pWorker, dataPtr1, size1);
+        workerWrite(pWorker, dataPtr1, size1 / m_numOutputChannels);
         if (size2 > 0) {
-            workerWrite(pWorker, dataPtr2, size2);
+            workerWrite(pWorker, dataPtr2, size2 / m_numOutputChannels);
         }
 
         QSharedPointer<FIFO<CSAMPLE>> pFifo = pWorker->getOutputFifo();
@@ -368,17 +368,16 @@ void SoundDeviceNetwork::workerWriteProcess(NetworkOutputStreamWorkerPtr pWorker
 }
 
 void SoundDeviceNetwork::workerWrite(NetworkOutputStreamWorkerPtr pWorker,
-        const CSAMPLE* buffer,
-        SINT samples) {
+        const CSAMPLE* buffer, int frames) {
     if (!pWorker->threadWaiting()) {
-        pWorker->addFramesWritten(samples / m_numOutputChannels);
+        pWorker->addFramesWritten(frames);
         return;
     }
 
     QSharedPointer<FIFO<CSAMPLE>> pFifo = pWorker->getOutputFifo();
     if (pFifo) {
         int writeAvailable = pFifo->writeAvailable();
-        int writeRequired = samples;
+        int writeRequired = frames * m_numOutputChannels;
         if (writeAvailable < writeRequired) {
             kLogger.warning() << "write: worker buffer full, losing samples";
             pWorker->incOverflowCount();
@@ -396,16 +395,16 @@ void SoundDeviceNetwork::workerWrite(NetworkOutputStreamWorkerPtr pWorker,
     }
 }
 
-void SoundDeviceNetwork::workerWriteSilence(NetworkOutputStreamWorkerPtr pWorker, SINT samples) {
+void SoundDeviceNetwork::workerWriteSilence(NetworkOutputStreamWorkerPtr pWorker, int frames) {
     if (!pWorker->threadWaiting()) {
-        pWorker->addFramesWritten(samples / m_numOutputChannels);
+        pWorker->addFramesWritten(frames);
         return;
     }
 
     QSharedPointer<FIFO<CSAMPLE>> pFifo = pWorker->getOutputFifo();
     if (pFifo) {
         int writeAvailable = pFifo->writeAvailable();
-        int writeRequired = samples;
+        int writeRequired = frames * m_numOutputChannels;
         if (writeAvailable < writeRequired) {
             kLogger.warning() << "writeSilence: worker buffer full, losing samples";
             pWorker->incOverflowCount();

src/soundio/sounddevicenetwork.h

@@ -52,9 +52,8 @@ class SoundDeviceNetwork : public SoundDevice {
             CSAMPLE* dataPtr1, ring_buffer_size_t size1,
             CSAMPLE* dataPtr2, ring_buffer_size_t size2);
     void workerWrite(NetworkOutputStreamWorkerPtr pWorker,
-            const CSAMPLE* buffer,
-            SINT samples);
-    void workerWriteSilence(NetworkOutputStreamWorkerPtr pWorker, SINT samples);
+            const CSAMPLE* buffer, int frames);
+    void workerWriteSilence(NetworkOutputStreamWorkerPtr pWorker, int frames);
 
     QSharedPointer<EngineNetworkStream> m_pNetworkStream;
     std::unique_ptr<FIFO<CSAMPLE>> m_outputFifo;