VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

DV Serial engine/worker: fix audio samples not flushed to audio FIFO immediately after queue processing which resulted in audible gaps

This commit is contained in:
f4exb 2016-09-11 19:58:38 +02:00
parent fed6b9a3bd
commit 5d30f6a51a
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sdrbase/dsp/dvserialworker.cpp
View File

@ -75,6 +75,8 @@ void DVSerialWorker::handleInputMessages()
{
m_timer->stop(); // suspend FIFO queue holding timeout
Message* message;
m_audioBufferFill = 0;
AudioFifo *audioFifo = 0;
while ((message = m_inputMessageQueue.pop()) != 0)
{
@ -86,6 +88,7 @@ void DVSerialWorker::handleInputMessages()
if (m_dvController.decode(m_dvAudioSamples, decodeMsg->getMbeFrame(), decodeMsg->getMbeRate(), dBVolume))
{
upsample6(m_dvAudioSamples, SerialDV::MBE_AUDIO_BLOCK_SIZE, decodeMsg->getChannels(), decodeMsg->getAudioFifo());
audioFifo = decodeMsg->getAudioFifo();
}
else
{
@ -96,6 +99,16 @@ void DVSerialWorker::handleInputMessages()
delete message;
}
if (audioFifo)
{
uint res = audioFifo->write((const quint8*)&m_audioBuffer[0], m_audioBufferFill, 10);
if (res != m_audioBufferFill)
{
qDebug("DVSerialWorker::handleInputMessages: %u/%u audio samples written", res, m_audioBufferFill);
}
}
m_timer->start(1000); // FIFO queue holding timeout
}
@ -127,18 +140,14 @@ void DVSerialWorker::upsample6(short *in, int nbSamplesIn, unsigned char channel
upsample = m_upsampleFilter.run((qint16) ((cur*j + prev*(6-j)) / 6));
m_audioBuffer[m_audioBufferFill].l = channels & 1 ? upsample : 0;
m_audioBuffer[m_audioBufferFill].r = (channels>>1) & 1 ? upsample : 0;
++m_audioBufferFill;
if (m_audioBufferFill >= m_audioBuffer.size())
if (m_audioBufferFill < m_audioBuffer.size() - 1)
{
uint res = audioFifo->write((const quint8*)&m_audioBuffer[0], m_audioBufferFill, 10);
if (res != m_audioBufferFill)
{
qDebug("DVSerialWorker::upsample6: %u/%u audio samples written", res, m_audioBufferFill);
}
m_audioBufferFill = 0;
++m_audioBufferFill;
}
else
{
qDebug("DVSerialWorker::upsample6: audio buffer is full check its size");
}
}