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

Trying to fix stereo opus stream

merge-requests/6/head
Phil Taylor 2021-06-17 09:55:09 +01:00
rodzic 74382b29ee
commit bbf981cc24
2 zmienionych plików z 13 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

19
audiohandler.cpp
Wyświetl plik

@ -292,8 +292,8 @@ void audioHandler::start()
// Opus codec
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));
//opus_encoder_ctl(encoder, OPUS_SET_INBAND_FEC(1));
//opus_encoder_ctl(encoder, OPUS_SET_PACKET_LOSS_PERC(5));
}
}
else {
@ -306,6 +306,8 @@ void audioHandler::start()
if (setup.codec == 0x40 || setup.codec == 0x80) {
// Opus codec
decoder = opus_decoder_create(setup.samplerate, setup.radioChan, &err);
//opus_decoder_ctl(decoder, OPUS_SET_INBAND_FEC(1));
//opus_decoder_ctl(decoder, OPUS_SET_PACKET_LOSS_PERC(5));
}
}
if (err < 0)
@ -483,17 +485,17 @@ void audioHandler::incomingAudio(audioPacket inPacket)
}
if (setup.codec == 0x40 || setup.codec == 0x80) {
unsigned char* in = (unsigned char*)inPacket.data.data();
//for (int i = 0; i < inPacket.data.length() / 2; i++)
//{
// in[i] = qToLittleEndian(in[i]);
//}
/* Encode the frame. */
QByteArray outPacket(chunkSize * setup.radioChan * 2, (char)0xff); // Preset the output buffer size.
qint16* out = (qint16*)outPacket.data();
int nbBytes = 0;
//while (lastSentSeq>0 && lastSentSeq++ < inPacket.seq)
//{
// nbBytes = opus_decode(decoder, Q_NULLPTR, inPacket.data.size(), out, outPacket.size(), 1);
//}
nbBytes = opus_decode(decoder, in, inPacket.data.size(), out, outPacket.size()/2, 0);
int nbBytes = opus_decode(decoder, in, inPacket.data.size(), out, outPacket.size()/2, 1);
if (nbBytes < 0)
{
qInfo(logAudio()) << (setup.isinput ? "Input" : "Output") << "Opus decode failed:" << opus_strerror(nbBytes) << "packet size" << inPacket.data.length();
@ -587,6 +589,7 @@ void audioHandler::incomingAudio(audioPacket inPacket)
}
//qDebug(logAudio()) << "Adding packet to buffer:" << inPacket.seq << ": " << inPacket.data.length();
lastSentSeq = inPacket.seq;
if (!ringBuf->try_write(inPacket))
{

3
audiohandler.h
Wyświetl plik

@ -164,7 +164,8 @@ private:
bool chunkAvailable;
quint32 lastSeq;
quint32 lastSentSeq=0;
quint16 radioSampleRate;
quint16 nativeSampleRate=0;
quint8 radioSampleBits;