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

Opus issue

merge-requests/9/merge
Phil Taylor 2022-04-07 17:35:58 +01:00
rodzic 53cae9173d
commit a21a44df86
1 zmienionych plików z 23 dodań i 21 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

44
audiohandler.cpp
Wyświetl plik

@ -467,6 +467,29 @@ void audioHandler::getNextAudioChunk(QByteArray& ret)
samplesF = samplesTemp;
}
if (setup.codec == 0x40 || setup.codec == 0x80)
{
//Are we using the opus codec?
float* in = (float*)samplesF.data();
/* Encode the frame. */
QByteArray outPacket(1275, (char)0xff); // Preset the output buffer size to MAXIMUM possible Opus frame size
unsigned char* out = (unsigned char*)outPacket.data();
int nbBytes = opus_encode_float(encoder, in, (samplesF.size()/setup.format.channelCount()), out, outPacket.length());
if (nbBytes < 0)
{
qInfo(logAudio()) << (setup.isinput ? "Input" : "Output") << "Opus encode failed:" << opus_strerror(nbBytes);
return;
}
else {
outPacket.resize(nbBytes);
samplesF = Eigen::Map<Eigen::VectorXf>(reinterpret_cast<float*>(outPacket.data()), outPacket.size() / int(sizeof(float)));
}
}
if (setup.format.sampleType() == QAudioFormat::SignedInt && setup.format.sampleSize() == 8)
{
Eigen::VectorXf samplesITemp = samplesF * float(std::numeric_limits<qint8>::max());
@ -523,27 +546,6 @@ void audioHandler::getNextAudioChunk(QByteArray& ret)
livePacket.data.clear();
livePacket.data = outPacket; // Copy output packet back to input buffer.
}
else if (setup.codec == 0x40 || setup.codec == 0x80)
{
//Are we using the opus codec?
qint16* in = (qint16*)livePacket.data.data();
/* Encode the frame. */
QByteArray outPacket(1275, (char)0xff); // Preset the output buffer size to MAXIMUM possible Opus frame size
unsigned char* out = (unsigned char*)outPacket.data();
int nbBytes = opus_encode(encoder, in, (setup.format.sampleRate() / 50), out, outPacket.length());
if (nbBytes < 0)
{
qInfo(logAudio()) << (setup.isinput ? "Input" : "Output") << "Opus encode failed:" << opus_strerror(nbBytes);
return;
}
else {
outPacket.resize(nbBytes);
livePacket.data.clear();
livePacket.data = outPacket; // Replace incoming data with converted.
}
}
ret = livePacket.data;
}
}