Merge pull request #2997 from birarda/master

bump silent audio frame packet version
This commit is contained in:
Stephen Birarda 2014-06-06 11:50:52 -07:00
commit 53a15bc7ed
2 changed files with 2 additions and 3 deletions

View file

@ -55,9 +55,7 @@ int PositionalAudioRingBuffer::parseData(const QByteArray& packet) {
readBytes += sizeof(int16_t);
if (numSilentSamples > 0) {
addSilentFrame(numSilentSamples);
}
addSilentFrame(numSilentSamples);
} else {
// there is audio data to read
readBytes += writeData(packet.data() + readBytes, packet.size() - readBytes);

View file

@ -49,6 +49,7 @@ PacketVersion versionForPacketType(PacketType type) {
switch (type) {
case PacketTypeMicrophoneAudioNoEcho:
case PacketTypeMicrophoneAudioWithEcho:
case PacketTypeSilentAudioFrame:
return 1;
case PacketTypeAvatarData:
return 3;