From 0a9a6f1ef897238cf773a7baea58a008a3bf4266 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Wed, 19 Nov 2014 14:32:50 -0800 Subject: [PATCH] Fix parsing of silent packets properties --- libraries/audio/src/InboundAudioStream.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libraries/audio/src/InboundAudioStream.cpp b/libraries/audio/src/InboundAudioStream.cpp index 366659b633..666cdee6b3 100644 --- a/libraries/audio/src/InboundAudioStream.cpp +++ b/libraries/audio/src/InboundAudioStream.cpp @@ -169,9 +169,16 @@ int InboundAudioStream::parseData(const QByteArray& packet) { } int InboundAudioStream::parseStreamProperties(PacketType type, const QByteArray& packetAfterSeqNum, int& numAudioSamples) { - // mixed audio packets do not have any info between the seq num and the audio data. - numAudioSamples = packetAfterSeqNum.size() / sizeof(int16_t); - return 0; + if (type == PacketTypeSilentAudioFrame) { + quint16 numSilentSamples = 0; + memcpy(&numSilentSamples, packetAfterSeqNum.constData(), sizeof(quint16)); + numAudioSamples = numSilentSamples; + return sizeof(quint16); + } else { + // mixed audio packets do not have any info between the seq num and the audio data. + numAudioSamples = packetAfterSeqNum.size() / sizeof(int16_t); + return 0; + } } int InboundAudioStream::parseAudioData(PacketType type, const QByteArray& packetAfterStreamProperties, int numAudioSamples) {