Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-16 22:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

seek past source UUID in mirrored packets

Browse source
This commit is contained in:
Stephen Birarda 2017-06-12 02:39:54 -07:00
parent e629881665
commit b5c26b596e
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
assignment-client/src/audio/AudioMixerClientData.cpp
View file

@ -303,6 +303,13 @@ int AudioMixerClientData::parseData(ReceivedMessage& message) {
// seek to the beginning of the packet so that the next reader is in the right spot
message.seek(0);
if (packetType == PacketType::MirroredMicrophoneAudioWithEcho
|| packetType == PacketType::MirroredMicrophoneAudioNoEcho
|| packetType == PacketType::MirroredSilentAudioFrame
|| packetType == PacketType::MirroredInjectAudio) {
message.seek(NUM_BYTES_RFC4122_UUID);
}
// check the overflow count before we parse data
auto overflowBefore = matchingStream->getOverflowCount();
auto parseResult = matchingStream->parseData(message);

3
libraries/networking/src/udt/PacketHeaders.cpp
View file

@ -41,7 +41,8 @@ const QSet<PacketType> NON_SOURCED_PACKETS = QSet<PacketType>()
<< PacketType::ICEServerHeartbeatDenied << PacketType::AssignmentClientStatus << PacketType::StopNode
<< PacketType::DomainServerRemovedNode << PacketType::UsernameFromIDReply << PacketType::OctreeFileReplacement
<< PacketType::MirroredMicrophoneAudioNoEcho << PacketType::MirroredMicrophoneAudioWithEcho
<< PacketType::MirroredInjectAudio << PacketType::MirroredSilentAudioFrame;
<< PacketType::MirroredInjectAudio << PacketType::MirroredSilentAudioFrame
<< PacketType::MirroredNegotiateAudioFormat;
PacketVersion versionForPacketType(PacketType packetType) {
switch (packetType) {