merge-requests/9/head
Phil Taylor 2022-01-07 14:52:33 +00:00
rodzic 82b655cc09
commit 89ac99b3f9
2 zmienionych plików z 7 dodań i 4 usunięć

Wyświetl plik

@ -602,7 +602,11 @@ void audioHandler::incomingAudio(audioPacket inPacket)
QByteArray outPacket((setup.samplerate / 50) * sizeof(qint16) * setup.radioChan, (char)0xff); // Preset the output buffer size.
qint16* out = (qint16*)outPacket.data();
int nSamples = opus_packet_get_nb_samples(in, livePacket.data.size(),setup.samplerate);
if (nSamples != setup.samplerate / 50)
if (nSamples == -1) {
// No opus data yet?
return;
}
else if (nSamples != setup.samplerate / 50)
{
qInfo(logAudio()) << "Opus nSamples=" << nSamples << " expected:" << (setup.samplerate / 50);
return;

Wyświetl plik

@ -3,6 +3,7 @@
#define STALE_CONNECTION 15
#define LOCK_PERIOD 10 // time to attempt to lock Mutex in ms
#define AUDIO_SEND_PERIOD 20 // how often to call the RX audio send function in ms
udpServer::udpServer(SERVERCONFIG config, audioSetup outAudio, audioSetup inAudio) :
config(config),
outAudio(outAudio),
@ -356,7 +357,7 @@ void udpServer::controlReceived()
rxAudioTimer = new QTimer();
rxAudioTimer->setTimerType(Qt::PreciseTimer);
connect(rxAudioTimer, &QTimer::timeout, this, std::bind(&udpServer::sendRxAudio, this));
rxAudioTimer->start(20);
rxAudioTimer->start(AUDIO_SEND_PERIOD);
}
}
@ -1276,8 +1277,6 @@ void udpServer::sendTokenResponse(CLIENT* c, quint8 type)
return;
}
#define PURGE_SECONDS 60
void udpServer::watchdog()
{
QDateTime now = QDateTime::currentDateTime();