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

Merge pull request #9200 from zfox23/fix_bubble_audio_bug

Browse source 
Fix audio injector bug after space bubble changes
This commit is contained in:
David Kelly 2016-12-13 14:23:01 -08:00 committed by GitHub
commit 97a5c0ef4b
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/audio/src/AudioInjector.cpp
View file

@ -278,6 +278,12 @@ int64_t AudioInjector::injectNextFrame() {
audioPacketStream.writeRawData(reinterpret_cast<const char*>(&_options.orientation), audioPacketStream.writeRawData(reinterpret_cast<const char*>(&_options.orientation),
sizeof(_options.orientation)); sizeof(_options.orientation));
audioPacketStream.writeRawData(reinterpret_cast<const char*>(&_options.position),
sizeof(_options.position));
glm::vec3 boxCorner = glm::vec3(0);
audioPacketStream.writeRawData(reinterpret_cast<const char*>(&boxCorner),
sizeof(glm::vec3));
// pack zero for radius // pack zero for radius
float radius = 0; float radius = 0;
audioPacketStream << radius; audioPacketStream << radius;

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

@ -78,7 +78,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
case PacketType::MicrophoneAudioNoEcho: case PacketType::MicrophoneAudioNoEcho:
case PacketType::MicrophoneAudioWithEcho: case PacketType::MicrophoneAudioWithEcho:
case PacketType::AudioStreamStats: case PacketType::AudioStreamStats:
return static_cast<PacketVersion>(AudioVersion::TerminatingStreamStats); return static_cast<PacketVersion>(AudioVersion::SpaceBubbleChanges);
default: default:
return 17; return 17;

1
libraries/networking/src/udt/PacketHeaders.h
View file

@ -234,6 +234,7 @@ enum class AudioVersion : PacketVersion {
CodecNameInAudioPackets, CodecNameInAudioPackets,
Exactly10msAudioPackets, Exactly10msAudioPackets,
TerminatingStreamStats, TerminatingStreamStats,
SpaceBubbleChanges,
}; };
#endif // hifi_PacketHeaders_h #endif // hifi_PacketHeaders_h