Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 23:57:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #449 from birarda/mixer-crash

Browse source 
temporary fix for mixer crash
This commit is contained in:
ZappoMan 2013-05-29 11:35:26 -07:00
commit 0443942ccb
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
audio-mixer/src/main.cpp
View file

@ -287,6 +287,11 @@ int main(int argc, const char* argv[]) {
} }
agentList->updateAgentWithData(agentAddress, packetData, receivedBytes); agentList->updateAgentWithData(agentAddress, packetData, receivedBytes);
if (std::isnan(((AudioRingBuffer *)avatarAgent->getLinkedData())->getBearing())) {
// kill off this agent - temporary solution to mixer crash on mac sleep
avatarAgent->setAlive(false);
}
} else if (packetData[0] == PACKET_HEADER_INJECT_AUDIO) { } else if (packetData[0] == PACKET_HEADER_INJECT_AUDIO) {
Agent* matchingInjector = NULL; Agent* matchingInjector = NULL;

8
libraries/audio/src/AudioRingBuffer.cpp
View file

@ -7,6 +7,7 @@
// //
#include <cstring> #include <cstring>
#include <math.h>
#include "PacketHeaders.h" #include "PacketHeaders.h"
@ -56,7 +57,12 @@ int AudioRingBuffer::parseData(unsigned char* sourceBuffer, int numBytes) {
memcpy(&_bearing, dataBuffer, sizeof(float)); memcpy(&_bearing, dataBuffer, sizeof(float));
dataBuffer += sizeof(_bearing); dataBuffer += sizeof(_bearing);
if (_bearing > 180 || _bearing < -180) { // if this agent sent us a NaN bearing then don't consider this good audio and bail
if (std::isnan(_bearing)) {
_endOfLastWrite = _nextOutput = _buffer;
_started = false;
return 0;
} else if (_bearing > 180 || _bearing < -180) {
// we were passed an invalid bearing because this agent wants loopback (pressed the H key) // we were passed an invalid bearing because this agent wants loopback (pressed the H key)
_shouldLoopbackForAgent = true; _shouldLoopbackForAgent = true;