mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Enable FEC for Opus codec

merge-requests/6/head
Phil Taylor 2021-06-16 23:44:59 +01:00
rodzic 7c0b2a51b1
commit 74382b29ee
2 zmienionych plików z 15 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

19
audiohandler.cpp
Wyświetl plik

@ -2,11 +2,13 @@
This class handles both RX and TX audio, each is created as a seperate instance of the class This class handles both RX and TX audio, each is created as a seperate instance of the class
but as the setup/handling if output (RX) and input (TX) devices is so similar I have combined them. but as the setup/handling if output (RX) and input (TX) devices is so similar I have combined them.
*/ */
#include "audiohandler.h" #include "audiohandler.h"
#include "logcategories.h" #include "logcategories.h"
#include "ulaw.h" #include "ulaw.h"
audioHandler::audioHandler(QObject* parent) audioHandler::audioHandler(QObject* parent)
{ {
Q_UNUSED(parent) Q_UNUSED(parent)
@ -288,7 +290,10 @@ void audioHandler::start()
audioInput->start(this); audioInput->start(this);
if (setup.codec == 0x40 || setup.codec == 0x80) { if (setup.codec == 0x40 || setup.codec == 0x80) {
// Opus codec // Opus codec
encoder = opus_encoder_create(setup.samplerate, setup.radioChan, OPUS_APPLICATION_AUDIO, &err); encoder = opus_encoder_create(setup.samplerate, setup.radioChan, OPUS_APPLICATION_AUDIO, &err);
opus_encoder_ctl(encoder, OPUS_SET_INBAND_FEC(1));
opus_encoder_ctl(encoder, OPUS_SET_PACKET_LOSS_PERC(5));
} }
} }
else { else {
@ -488,22 +493,26 @@ void audioHandler::incomingAudio(audioPacket inPacket)
QByteArray outPacket(chunkSize * setup.radioChan * 2, (char)0xff); // Preset the output buffer size. QByteArray outPacket(chunkSize * setup.radioChan * 2, (char)0xff); // Preset the output buffer size.
qint16* out = (qint16*)outPacket.data(); qint16* out = (qint16*)outPacket.data();
int nbBytes = opus_decode(decoder, in, inPacket.data.length(), out, outPacket.length()/2, 0); int nbBytes = opus_decode(decoder, in, inPacket.data.size(), out, outPacket.size()/2, 1);
if (nbBytes < 0) if (nbBytes < 0)
{ {
qInfo(logAudio()) << (setup.isinput ? "Input" : "Output") << "Opus decode failed:" << opus_strerror(nbBytes) << "packet size" << inPacket.data.length(); qInfo(logAudio()) << (setup.isinput ? "Input" : "Output") << "Opus decode failed:" << opus_strerror(nbBytes) << "packet size" << inPacket.data.length();
return; return;
} }
else { else {
outPacket.resize(nbBytes); if (nbBytes * 2 != outPacket.size())
qInfo(logAudio()) << (setup.isinput ? "Input" : "Output") << "Opus decoded" << inPacket.data.length() << "bytes, into" << outPacket.length() << "bytes"; {
qInfo(logAudio()) << (setup.isinput ? "Input" : "Output") << "Opus decoder mismatch: nbBytes:" << nbBytes*2 << "outPacket:" << outPacket.size() ;
outPacket.resize(nbBytes * 2);
}
qInfo(logAudio()) << (setup.isinput ? "Input" : "Output") << "Opus decoded" << inPacket.data.size() << "bytes, into" << outPacket.length() << "bytes";
inPacket.data.clear(); inPacket.data.clear();
inPacket.data = outPacket; // Replace incoming data with converted. inPacket.data = outPacket; // Replace incoming data with converted.
} }
} }
//qDebug(logAudio()) << "Got" << radioSampleBits << "bits, length" << inPacket.data.length(); //qDebug(logAudio()) << "Got" << setup.bits << "bits, length" << inPacket.data.length();
// Incoming data is 8bits? // Incoming data is 8bits?
if (setup.bits == 8) if (setup.bits == 8)
{ {
@ -555,7 +564,7 @@ void audioHandler::incomingAudio(audioPacket inPacket)
/* We now have an array of 16bit samples in the NATIVE samplerate of the radio /* We now have an array of 16bit samples in the NATIVE samplerate of the radio
If the radio sample rate is below 48000, we need to resample. If the radio sample rate is below 48000, we need to resample.
*/ */
//qDebug(logAudio()) << "Now 16 bit stereo, length" << inPacket.data.length(); qDebug(logAudio()) << "Now 16 bit stereo, length" << inPacket.data.length();
if (ratioDen != 1) { if (ratioDen != 1) {

2
udphandler.cpp
Wyświetl plik

@ -912,7 +912,7 @@ void udpAudio::dataReceived()
control_packet_t in = (control_packet_t)r.constData(); control_packet_t in = (control_packet_t)r.constData();
if (in->type != 0x01 && in->len >= 0xAC) { if (in->type != 0x01 && in->len >= 0x20) {
if (in->seq == 0) if (in->seq == 0)
{ {
// Seq number has rolled over. // Seq number has rolled over.