Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 19:29:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup call to parseAudioData

Browse source
This commit is contained in:
Stephen Birarda 2015-07-15 17:20:02 -07:00
parent 9318f464a4
commit 333cd77d9c
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/audio-client/src/AudioClient.cpp
View file

@ -934,12 +934,12 @@ void AudioClient::handleAudioInput() {
// pack the orientation // pack the orientation
_audioPacket->writePrimitive(headOrientation); _audioPacket->writePrimitive(headOrientation);
if (_audioPacket->getType() != PacketType::SilentAudioFrame) { if (_audioPacket->getType() != PacketType::SilentAudioFrame) {
// audio samples have already been packed (written to networkAudioSamples) // audio samples have already been packed (written to networkAudioSamples)
_audioPacket->setPayloadSize(_audioPacket->getPayloadSize() + numNetworkBytes); _audioPacket->setPayloadSize(_audioPacket->getPayloadSize() + numNetworkBytes);
} }
_stats.sentPacket(); _stats.sentPacket();
nodeList->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SendAudioPacket); nodeList->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SendAudioPacket);

7
libraries/audio/src/InboundAudioStream.cpp
View file

@ -100,7 +100,7 @@ void InboundAudioStream::perSecondCallbackForUpdatingStats() {
} }
int InboundAudioStream::parseData(NLPacket& packet) { int InboundAudioStream::parseData(NLPacket& packet) {
// parse sequence number and track it // parse sequence number and track it
quint16 sequence; quint16 sequence;
packet.readPrimitive(&sequence); packet.readPrimitive(&sequence);
@ -133,8 +133,9 @@ int InboundAudioStream::parseData(NLPacket& packet) {
if (packet.getType() == PacketType::SilentAudioFrame) { if (packet.getType() == PacketType::SilentAudioFrame) {
writeDroppableSilentSamples(networkSamples); writeDroppableSilentSamples(networkSamples);
} else { } else {
int audioBytes = parseAudioData(packet.getType(), QByteArray::fromRawData(packet.getPayload() + packet.pos(), int audioBytes = parseAudioData(packet.getType(),
packet.bytesLeftToRead()), QByteArray::fromRawData(packet.getPayload() + packet.pos(),
packet.bytesLeftToRead()),
networkSamples); networkSamples);
packet.seek(packet.pos() + audioBytes); packet.seek(packet.pos() + audioBytes);
} }

2
libraries/networking/src/udt/Packet.cpp
View file

@ -138,7 +138,7 @@ Packet& Packet::operator=(Packet&& other) {
void Packet::setPayloadSize(qint64 payloadSize) { void Packet::setPayloadSize(qint64 payloadSize) {
if (isWritable()) { if (isWritable()) {
Q_ASSERT(payloadSize <= _payloadCapacity); Q_ASSERT(payloadSize <= _payloadCapacity);
_payloadSize = std::max(payloadSize, _payloadCapacity); _payloadSize = payloadSize;
} else { } else {
qDebug() << "You can not call setPayloadSize for a non-writeable Packet."; qDebug() << "You can not call setPayloadSize for a non-writeable Packet.";
Q_ASSERT(false); Q_ASSERT(false);