From 47766d6c6b3b6961dbe676e5aa2d53b8f8456a5a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 15 May 2013 15:20:11 -0700 Subject: [PATCH 1/4] add methods to AudioInjector to prepare for procedural injection --- libraries/shared/src/Agent.cpp | 1 - libraries/shared/src/AudioInjector.cpp | 56 +++++++++++++++++++------- libraries/shared/src/AudioInjector.h | 7 +++- 3 files changed, 47 insertions(+), 17 deletions(-) diff --git a/libraries/shared/src/Agent.cpp b/libraries/shared/src/Agent.cpp index f8683fc416..db4170515a 100644 --- a/libraries/shared/src/Agent.cpp +++ b/libraries/shared/src/Agent.cpp @@ -74,7 +74,6 @@ Agent::Agent(const Agent &otherAgent) : _localSocket = NULL; } - if (otherAgent._activeSocket == otherAgent._publicSocket) { _activeSocket = _publicSocket; } else if (otherAgent._activeSocket == otherAgent._localSocket) { diff --git a/libraries/shared/src/AudioInjector.cpp b/libraries/shared/src/AudioInjector.cpp index e08100130e..1417a8ffa7 100644 --- a/libraries/shared/src/AudioInjector.cpp +++ b/libraries/shared/src/AudioInjector.cpp @@ -21,30 +21,41 @@ const float SAMPLE_RATE = 22050.0f; const float BUFFER_SEND_INTERVAL_USECS = (BUFFER_LENGTH_SAMPLES / SAMPLE_RATE) * 1000000; AudioInjector::AudioInjector(const char* filename) : - _numTotalBytesAudio(0), _position(), _bearing(0), - _attenuationModifier(255) { - + _attenuationModifier(255), + _indexOfNextSlot(0) +{ std::fstream sourceFile; sourceFile.open(filename, std::ios::in | std::ios::binary); sourceFile.seekg(0, std::ios::end); - _numTotalBytesAudio = sourceFile.tellg(); - if (_numTotalBytesAudio == -1) { + int totalBytes = sourceFile.tellg(); + if (totalBytes == -1) { printf("Error reading audio data from file %s\n", filename); _audioSampleArray = NULL; } else { - printf("Read %d bytes from audio file\n", _numTotalBytesAudio); + printf("Read %d bytes from audio file\n", totalBytes); sourceFile.seekg(0, std::ios::beg); - long sizeOfShortArray = _numTotalBytesAudio / 2; - _audioSampleArray = new int16_t[sizeOfShortArray]; + _numTotalSamples = totalBytes / 2; + _audioSampleArray = new int16_t[_numTotalSamples]; - sourceFile.read((char *)_audioSampleArray, _numTotalBytesAudio); + sourceFile.read((char *)_audioSampleArray, _numTotalSamples); } } +AudioInjector::AudioInjector(int maxNumSamples) : + _numTotalSamples(maxNumSamples), + _position(), + _bearing(0), + _attenuationModifier(255), + _indexOfNextSlot(0) +{ + _audioSampleArray = new int16_t[maxNumSamples]; + memset(_audioSampleArray, 0, _numTotalSamples * sizeof(int16_t)); +} + AudioInjector::~AudioInjector() { delete[] _audioSampleArray; } @@ -55,6 +66,21 @@ void AudioInjector::setPosition(float* position) { _position[2] = position[2]; } +void AudioInjector::addSample(const int16_t sample) { + if (_indexOfNextSlot != _numTotalSamples) { + // only add this sample if we actually have space for it + _audioSampleArray[_indexOfNextSlot++] = sample; + } +} + +void AudioInjector::addSamples(int16_t* sampleBuffer, int numSamples) { + if (_audioSampleArray + _indexOfNextSlot + numSamples <= _audioSampleArray + (_numTotalSamples / sizeof(int16_t))) { + // only copy the audio from the sample buffer if there's space + memcpy(_audioSampleArray + _indexOfNextSlot, sampleBuffer, numSamples * sizeof(int16_t)); + _indexOfNextSlot += numSamples; + } +} + void AudioInjector::injectAudio(UDPSocket* injectorSocket, sockaddr* destinationSocket) const { if (_audioSampleArray != NULL) { timeval startTime; @@ -77,17 +103,17 @@ void AudioInjector::injectAudio(UDPSocket* injectorSocket, sockaddr* destination memcpy(currentPacketPtr, &_bearing, sizeof(float)); currentPacketPtr += sizeof(float); - for (int i = 0; i < _numTotalBytesAudio; i += BUFFER_LENGTH_BYTES) { + for (int i = 0; i < _numTotalSamples; i += BUFFER_LENGTH_SAMPLES) { gettimeofday(&startTime, NULL); - int numBytesToCopy = BUFFER_LENGTH_BYTES; + int numSamplesToCopy = BUFFER_LENGTH_SAMPLES; - if (_numTotalBytesAudio - i < BUFFER_LENGTH_BYTES) { - numBytesToCopy = _numTotalBytesAudio - i; - memset(currentPacketPtr + numBytesToCopy, 0, BUFFER_LENGTH_BYTES - numBytesToCopy); + if (_numTotalSamples - i < BUFFER_LENGTH_SAMPLES) { + numSamplesToCopy = _numTotalSamples - i; + memset(currentPacketPtr + numSamplesToCopy, 0, BUFFER_LENGTH_BYTES - (numSamplesToCopy * sizeof(int16_t))); } - memcpy(currentPacketPtr, _audioSampleArray + (i / 2), numBytesToCopy); + memcpy(currentPacketPtr, _audioSampleArray + i, numSamplesToCopy * sizeof(int16_t)); injectorSocket->send(destinationSocket, dataPacket, sizeof(dataPacket)); diff --git a/libraries/shared/src/AudioInjector.h b/libraries/shared/src/AudioInjector.h index 2515dcfcdc..27223e562c 100644 --- a/libraries/shared/src/AudioInjector.h +++ b/libraries/shared/src/AudioInjector.h @@ -17,19 +17,24 @@ class AudioInjector { public: AudioInjector(const char* filename); + AudioInjector(int maxNumSamples); ~AudioInjector(); void setPosition(float* position); void setBearing(float bearing) { _bearing = bearing; } void setAttenuationModifier(unsigned char attenuationModifier) { _attenuationModifier = attenuationModifier; } + void addSample(const int16_t sample); + void addSamples(int16_t* sampleBuffer, int numSamples); + void injectAudio(UDPSocket* injectorSocket, sockaddr* destinationSocket) const; private: int16_t* _audioSampleArray; - int _numTotalBytesAudio; + int _numTotalSamples; float _position[3]; float _bearing; unsigned char _attenuationModifier; + int _indexOfNextSlot; }; #endif /* defined(__hifi__AudioInjector__) */ From fc5e42cf8bff57fa7e2b71140a10f877c9d321f0 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 15 May 2013 16:10:59 -0700 Subject: [PATCH 2/4] add threaded injection of audio via audio injector class --- audio-mixer/src/main.cpp | 6 +-- avatar-mixer/src/main.cpp | 4 +- domain-server/src/main.cpp | 4 +- eve/src/main.cpp | 55 ++++++++++++-------------- injector/src/main.cpp | 5 ++- interface/src/Application.cpp | 4 +- interface/src/Audio.cpp | 2 +- interface/src/PairingHandler.cpp | 2 +- libraries/shared/src/AgentList.cpp | 10 ++--- libraries/shared/src/AgentList.h | 2 +- libraries/shared/src/AudioInjector.cpp | 26 ++++++++++-- libraries/shared/src/AudioInjector.h | 10 ++++- libraries/shared/src/UDPSocket.cpp | 9 ++--- libraries/shared/src/UDPSocket.h | 26 ++++++------ voxel-server/src/main.cpp | 16 ++++---- 15 files changed, 100 insertions(+), 81 deletions(-) diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp index b7132954e2..d8a0384b69 100644 --- a/audio-mixer/src/main.cpp +++ b/audio-mixer/src/main.cpp @@ -94,7 +94,7 @@ int main(int argc, const char* argv[]) { sockaddr* agentAddress = new sockaddr; // make sure our agent socket is non-blocking - agentList->getAgentSocket().setBlocking(false); + agentList->getAgentSocket()->setBlocking(false); int nextFrame = 0; timeval startTime; @@ -256,7 +256,7 @@ int main(int argc, const char* argv[]) { } memcpy(clientPacket + 1, clientSamples, sizeof(clientSamples)); - agentList->getAgentSocket().send(agent->getPublicSocket(), clientPacket, BUFFER_LENGTH_BYTES + 1); + agentList->getAgentSocket()->send(agent->getPublicSocket(), clientPacket, BUFFER_LENGTH_BYTES + 1); } // push forward the next output pointers for any audio buffers we used @@ -274,7 +274,7 @@ int main(int argc, const char* argv[]) { } // pull any new audio data from agents off of the network stack - while (agentList->getAgentSocket().receive(agentAddress, packetData, &receivedBytes)) { + while (agentList->getAgentSocket()->receive(agentAddress, packetData, &receivedBytes)) { if (packetData[0] == PACKET_HEADER_INJECT_AUDIO || packetData[0] == PACKET_HEADER_MICROPHONE_AUDIO) { char agentType = (packetData[0] == PACKET_HEADER_MICROPHONE_AUDIO) ? AGENT_TYPE_AVATAR diff --git a/avatar-mixer/src/main.cpp b/avatar-mixer/src/main.cpp index 1da884110c..d51e48b055 100644 --- a/avatar-mixer/src/main.cpp +++ b/avatar-mixer/src/main.cpp @@ -72,7 +72,7 @@ int main(int argc, const char* argv[]) { uint16_t agentID = 0; while (true) { - if (agentList->getAgentSocket().receive(agentAddress, packetData, &receivedBytes)) { + if (agentList->getAgentSocket()->receive(agentAddress, packetData, &receivedBytes)) { switch (packetData[0]) { case PACKET_HEADER_HEAD_DATA: // grab the agent ID from the packet @@ -93,7 +93,7 @@ int main(int argc, const char* argv[]) { } } - agentList->getAgentSocket().send(agentAddress, broadcastPacket, currentBufferPosition - broadcastPacket); + agentList->getAgentSocket()->send(agentAddress, broadcastPacket, currentBufferPosition - broadcastPacket); break; case PACKET_HEADER_DOMAIN: diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index 0192eb9a37..959456bd03 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -97,7 +97,7 @@ int main(int argc, const char * argv[]) uint16_t packetAgentID = 0; while (true) { - if (agentList->getAgentSocket().receive((sockaddr *)&agentPublicAddress, packetData, &receivedBytes) && + if (agentList->getAgentSocket()->receive((sockaddr *)&agentPublicAddress, packetData, &receivedBytes) && (packetData[0] == PACKET_HEADER_DOMAIN_RFD || packetData[0] == PACKET_HEADER_DOMAIN_LIST_REQUEST)) { std::map newestSoloAgents; @@ -169,7 +169,7 @@ int main(int argc, const char * argv[]) currentBufferPos += packAgentId(currentBufferPos, packetAgentID); // send the constructed list back to this agent - agentList->getAgentSocket().send((sockaddr*) &agentPublicAddress, + agentList->getAgentSocket()->send((sockaddr*) &agentPublicAddress, broadcastPacket, (currentBufferPos - startPointer) + 1); } diff --git a/eve/src/main.cpp b/eve/src/main.cpp index 4345da12a2..4361db107d 100644 --- a/eve/src/main.cpp +++ b/eve/src/main.cpp @@ -34,7 +34,6 @@ const float EVE_PELVIS_HEIGHT = 0.565925f; const float AUDIO_INJECT_PROXIMITY = 0.4f; bool stopReceiveAgentDataThread; -bool injectAudioThreadRunning = false; int TEMP_AUDIO_LISTEN_PORT = 55439; UDPSocket audioSocket(TEMP_AUDIO_LISTEN_PORT); @@ -47,7 +46,7 @@ void *receiveAgentData(void *args) { AgentList* agentList = AgentList::getInstance(); while (!::stopReceiveAgentDataThread) { - if (agentList->getAgentSocket().receive(&senderAddress, incomingPacket, &bytesReceived)) { + if (agentList->getAgentSocket()->receive(&senderAddress, incomingPacket, &bytesReceived)) { switch (incomingPacket[0]) { case PACKET_HEADER_BULK_AVATAR_DATA: // this is the positional data for other agents @@ -67,29 +66,6 @@ void *receiveAgentData(void *args) { return NULL; } -void *injectAudio(void *args) { - ::injectAudioThreadRunning = true; - - AudioInjector* eveAudioInjector = (AudioInjector *)args; - - // look for an audio mixer in our agent list - Agent* audioMixer = AgentList::getInstance()->soloAgentOfType(AGENT_TYPE_AUDIO_MIXER); - - if (audioMixer) { - // until the audio mixer is setup for ping-reply, activate the public socket if it's not active - if (!audioMixer->getActiveSocket()) { - audioMixer->activatePublicSocket(); - } - - // we have an active audio mixer we can send data to - eveAudioInjector->injectAudio(&::audioSocket, audioMixer->getActiveSocket()); - } - - ::injectAudioThreadRunning = false; - pthread_exit(0); - return NULL; -} - void createAvatarDataForAgent(Agent* agent) { if (!agent->getLinkedData()) { agent->setLinkedData(new AvatarData()); @@ -138,6 +114,14 @@ int main(int argc, const char* argv[]) { // lower Eve's volume by setting the attentuation modifier (this is a value out of 255) eveAudioInjector.setAttenuationModifier(190); + // pass the agentList UDPSocket pointer to the audio injector + eveAudioInjector.setInjectorSocket(agentList->getAgentSocket()); + + // set the position of the audio injector + float injectorPosition[3]; + memcpy(injectorPosition, &eve.getPosition(), sizeof(injectorPosition)); + eveAudioInjector.setPosition(injectorPosition); + // register the callback for agent data creation agentList->linkedDataCreateCallback = createAvatarDataForAgent; @@ -146,8 +130,6 @@ int main(int argc, const char* argv[]) { timeval thisSend; double numMicrosecondsSleep = 0; - - pthread_t injectAudioThread; int handStateTimer = 0; @@ -167,10 +149,10 @@ int main(int argc, const char* argv[]) { packetPosition += eve.getBroadcastData(packetPosition); // use the UDPSocket instance attached to our agent list to send avatar data to mixer - agentList->getAgentSocket().send(avatarMixer->getActiveSocket(), broadcastPacket, packetPosition - broadcastPacket); + agentList->getAgentSocket()->send(avatarMixer->getActiveSocket(), broadcastPacket, packetPosition - broadcastPacket); } - if (!::injectAudioThreadRunning) { + if (!eveAudioInjector.isInjectingAudio()) { // enumerate the other agents to decide if one is close enough that eve should talk for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) { AvatarData* avatarData = (AvatarData*) agent->getLinkedData(); @@ -180,7 +162,20 @@ int main(int argc, const char* argv[]) { float squareDistance = glm::dot(tempVector, tempVector); if (squareDistance <= AUDIO_INJECT_PROXIMITY) { - pthread_create(&injectAudioThread, NULL, injectAudio, (void*) &eveAudioInjector); + // look for an audio mixer in our agent list + Agent* audioMixer = AgentList::getInstance()->soloAgentOfType(AGENT_TYPE_AUDIO_MIXER); + + if (audioMixer) { + // until the audio mixer is setup for ping-reply, activate the public socket if it's not active + if (!audioMixer->getActiveSocket()) { + audioMixer->activatePublicSocket(); + } + + eveAudioInjector.setDestinationSocket(audioMixer->getActiveSocket()); + + // we have an active audio mixer we can send data to + eveAudioInjector.threadInjectionOfAudio(); + } } } } diff --git a/injector/src/main.cpp b/injector/src/main.cpp index 028de6cb04..dee09de6c8 100644 --- a/injector/src/main.cpp +++ b/injector/src/main.cpp @@ -104,6 +104,7 @@ int main(int argc, char* argv[]) { mixerSocket.sin_family = AF_INET; mixerSocket.sin_addr.s_addr = inet_addr(EC2_WEST_AUDIO_SERVER); mixerSocket.sin_port = htons((uint16_t)AUDIO_UDP_LISTEN_PORT); + if (processParameters(argc, argv)) { if (::sourceAudioFile == NULL) { @@ -111,6 +112,8 @@ int main(int argc, char* argv[]) { exit(-1); } else { AudioInjector injector(sourceAudioFile); + injector.setInjectorSocket(&streamSocket); + injector.setDestinationSocket((sockaddr*) &mixerSocket); injector.setPosition(::floatArguments); injector.setBearing(*(::floatArguments + 3)); @@ -120,7 +123,7 @@ int main(int argc, char* argv[]) { int usecDelay = 0; while (true) { - injector.injectAudio(&streamSocket, (sockaddr*) &mixerSocket); + injector.injectAudio(); if (!::loopAudio) { delay = randFloatInRange(::sleepIntervalMin, ::sleepIntervalMax); diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index b5e6ffd3e7..6b4539904e 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -179,7 +179,7 @@ Application::Application(int& argc, char** argv) : AgentList::createInstance(AGENT_TYPE_AVATAR, listenPort); _enableNetworkThread = !cmdOptionExists(argc, constArgv, "--nonblocking"); if (!_enableNetworkThread) { - AgentList::getInstance()->getAgentSocket().setBlocking(false); + AgentList::getInstance()->getAgentSocket()->setBlocking(false); } const char* domainIP = getCmdOption(argc, constArgv, "--domain"); @@ -2022,7 +2022,7 @@ void* Application::networkReceive(void* args) { app->_wantToKillLocalVoxels = false; } - if (AgentList::getInstance()->getAgentSocket().receive(&senderAddress, app->_incomingPacket, &bytesReceived)) { + if (AgentList::getInstance()->getAgentSocket()->receive(&senderAddress, app->_incomingPacket, &bytesReceived)) { app->_packetCount++; app->_bytesCount += bytesReceived; diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index ceaac13dda..cb02364e58 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -146,7 +146,7 @@ int audioCallback (const void* inputBuffer, // copy the audio data to the last BUFFER_LENGTH_BYTES bytes of the data packet memcpy(currentPacketPtr, inputLeft, BUFFER_LENGTH_BYTES); - agentList->getAgentSocket().send(audioMixer->getActiveSocket(), dataPacket, BUFFER_LENGTH_BYTES + leadingBytes); + agentList->getAgentSocket()->send(audioMixer->getActiveSocket(), dataPacket, BUFFER_LENGTH_BYTES + leadingBytes); } } diff --git a/interface/src/PairingHandler.cpp b/interface/src/PairingHandler.cpp index 3023290708..06028b4427 100644 --- a/interface/src/PairingHandler.cpp +++ b/interface/src/PairingHandler.cpp @@ -19,7 +19,7 @@ const int PAIRING_SERVER_PORT = 7247; void PairingHandler::sendPairRequest() { // grab the agent socket from the AgentList singleton - UDPSocket *agentSocket = &AgentList::getInstance()->getAgentSocket(); + UDPSocket *agentSocket = AgentList::getInstance()->getAgentSocket(); // prepare the pairing request packet diff --git a/libraries/shared/src/AgentList.cpp b/libraries/shared/src/AgentList.cpp index 40a9e41722..fef0446056 100644 --- a/libraries/shared/src/AgentList.cpp +++ b/libraries/shared/src/AgentList.cpp @@ -78,10 +78,6 @@ AgentList::~AgentList() { pthread_mutex_destroy(&mutex); } -UDPSocket& AgentList::getAgentSocket() { - return agentSocket; -} - unsigned int AgentList::getSocketListenPort() { return socketListenPort; } @@ -337,8 +333,8 @@ void *pingUnknownAgents(void *args) { && (agent->getPublicSocket() != NULL && agent->getLocalSocket() != NULL)) { // ping both of the sockets for the agent so we can figure out // which socket we can use - agentList->getAgentSocket().send(agent->getPublicSocket(), &PACKET_HEADER_PING, 1); - agentList->getAgentSocket().send(agent->getLocalSocket(), &PACKET_HEADER_PING, 1); + agentList->getAgentSocket()->send(agent->getPublicSocket(), &PACKET_HEADER_PING, 1); + agentList->getAgentSocket()->send(agent->getLocalSocket(), &PACKET_HEADER_PING, 1); } } @@ -433,7 +429,7 @@ void *checkInWithDomainServer(void *args) { packSocket(packet + 2, localAddress, htons(parentAgentList->getSocketListenPort())); - parentAgentList->getAgentSocket().send(DOMAIN_IP, DOMAINSERVER_PORT, packet, sizeof(packet)); + parentAgentList->getAgentSocket()->send(DOMAIN_IP, DOMAINSERVER_PORT, packet, sizeof(packet)); packet[0] = PACKET_HEADER_DOMAIN_LIST_REQUEST; diff --git a/libraries/shared/src/AgentList.h b/libraries/shared/src/AgentList.h index 399085404d..280927929f 100644 --- a/libraries/shared/src/AgentList.h +++ b/libraries/shared/src/AgentList.h @@ -49,7 +49,7 @@ public: int size() { return _numAgents; } - UDPSocket& getAgentSocket(); + UDPSocket* getAgentSocket() { return &agentSocket; } void lock() { pthread_mutex_lock(&mutex); } void unlock() { pthread_mutex_unlock(&mutex); } diff --git a/libraries/shared/src/AudioInjector.cpp b/libraries/shared/src/AudioInjector.cpp index 1417a8ffa7..c627b591bd 100644 --- a/libraries/shared/src/AudioInjector.cpp +++ b/libraries/shared/src/AudioInjector.cpp @@ -24,7 +24,8 @@ AudioInjector::AudioInjector(const char* filename) : _position(), _bearing(0), _attenuationModifier(255), - _indexOfNextSlot(0) + _indexOfNextSlot(0), + _isInjectingAudio(false) { std::fstream sourceFile; @@ -50,7 +51,8 @@ AudioInjector::AudioInjector(int maxNumSamples) : _position(), _bearing(0), _attenuationModifier(255), - _indexOfNextSlot(0) + _indexOfNextSlot(0), + _isInjectingAudio(false) { _audioSampleArray = new int16_t[maxNumSamples]; memset(_audioSampleArray, 0, _numTotalSamples * sizeof(int16_t)); @@ -81,8 +83,10 @@ void AudioInjector::addSamples(int16_t* sampleBuffer, int numSamples) { } } -void AudioInjector::injectAudio(UDPSocket* injectorSocket, sockaddr* destinationSocket) const { +void AudioInjector::injectAudio() { if (_audioSampleArray != NULL) { + _isInjectingAudio = true; + timeval startTime; // one byte for header, 3 positional floats, 1 bearing float, 1 attenuation modifier byte @@ -115,12 +119,26 @@ void AudioInjector::injectAudio(UDPSocket* injectorSocket, sockaddr* destination memcpy(currentPacketPtr, _audioSampleArray + i, numSamplesToCopy * sizeof(int16_t)); - injectorSocket->send(destinationSocket, dataPacket, sizeof(dataPacket)); + _injectorSocket->send(&_destinationSocket, dataPacket, sizeof(dataPacket)); double usecToSleep = BUFFER_SEND_INTERVAL_USECS - (usecTimestampNow() - usecTimestamp(&startTime)); if (usecToSleep > 0) { usleep(usecToSleep); } } + + _isInjectingAudio = false; } } + +void* injectAudioViaThread(void* args) { + AudioInjector* parentInjector = (AudioInjector*) args; + parentInjector->injectAudio(); + + pthread_exit(0); +} + +void AudioInjector::threadInjectionOfAudio() { + pthread_t audioInjectThread; + pthread_create(&audioInjectThread, NULL, injectAudioViaThread, (void*) this); +} diff --git a/libraries/shared/src/AudioInjector.h b/libraries/shared/src/AudioInjector.h index 27223e562c..3e79869034 100644 --- a/libraries/shared/src/AudioInjector.h +++ b/libraries/shared/src/AudioInjector.h @@ -20,14 +20,19 @@ public: AudioInjector(int maxNumSamples); ~AudioInjector(); + bool isInjectingAudio() const { return _isInjectingAudio; } + void setPosition(float* position); void setBearing(float bearing) { _bearing = bearing; } void setAttenuationModifier(unsigned char attenuationModifier) { _attenuationModifier = attenuationModifier; } + void setInjectorSocket(UDPSocket* injectorSocket) { _injectorSocket = injectorSocket; } + void setDestinationSocket(sockaddr* destinationSocket) { _destinationSocket = *destinationSocket; } void addSample(const int16_t sample); void addSamples(int16_t* sampleBuffer, int numSamples); - void injectAudio(UDPSocket* injectorSocket, sockaddr* destinationSocket) const; + void injectAudio(); + void threadInjectionOfAudio(); private: int16_t* _audioSampleArray; int _numTotalSamples; @@ -35,6 +40,9 @@ private: float _bearing; unsigned char _attenuationModifier; int _indexOfNextSlot; + UDPSocket* _injectorSocket; + sockaddr _destinationSocket; + bool _isInjectingAudio; }; #endif /* defined(__hifi__AudioInjector__) */ diff --git a/libraries/shared/src/UDPSocket.cpp b/libraries/shared/src/UDPSocket.cpp index 31040946e0..a83932baa0 100644 --- a/libraries/shared/src/UDPSocket.cpp +++ b/libraries/shared/src/UDPSocket.cpp @@ -204,13 +204,12 @@ void UDPSocket::setBlocking(bool blocking) { } // Receive data on this socket with retrieving address of sender -bool UDPSocket::receive(void *receivedData, ssize_t *receivedBytes) { - +bool UDPSocket::receive(void *receivedData, ssize_t *receivedBytes) const { return receive((sockaddr *)&senderAddress, receivedData, receivedBytes); } // Receive data on this socket with the address of the sender -bool UDPSocket::receive(sockaddr *recvAddress, void *receivedData, ssize_t *receivedBytes) { +bool UDPSocket::receive(sockaddr *recvAddress, void *receivedData, ssize_t *receivedBytes) const { #ifdef _WIN32 int addressSize = sizeof(*recvAddress); @@ -223,7 +222,7 @@ bool UDPSocket::receive(sockaddr *recvAddress, void *receivedData, ssize_t *rece return (*receivedBytes > 0); } -int UDPSocket::send(sockaddr *destAddress, const void *data, size_t byteLength) { +int UDPSocket::send(sockaddr *destAddress, const void *data, size_t byteLength) const { // send data via UDP int sent_bytes = sendto(handle, (const char*)data, byteLength, 0, (sockaddr *) destAddress, sizeof(sockaddr_in)); @@ -236,7 +235,7 @@ int UDPSocket::send(sockaddr *destAddress, const void *data, size_t byteLength) return sent_bytes; } -int UDPSocket::send(char * destAddress, int destPort, const void *data, size_t byteLength) { +int UDPSocket::send(char * destAddress, int destPort, const void *data, size_t byteLength) const { // change address and port on reusable global to passed variables destSockaddr.sin_addr.s_addr = inet_addr(destAddress); diff --git a/libraries/shared/src/UDPSocket.h b/libraries/shared/src/UDPSocket.h index 80c093d6f4..85c3be235a 100644 --- a/libraries/shared/src/UDPSocket.h +++ b/libraries/shared/src/UDPSocket.h @@ -19,19 +19,19 @@ #define MAX_BUFFER_LENGTH_BYTES 1500 class UDPSocket { - public: - UDPSocket(int listening_port); - ~UDPSocket(); - bool init(); - void setBlocking(bool blocking); - bool isBlocking() { return blocking; } - int send(sockaddr *destAddress, const void *data, size_t byteLength); - int send(char *destAddress, int destPort, const void *data, size_t byteLength); - bool receive(void *receivedData, ssize_t *receivedBytes); - bool receive(sockaddr *recvAddress, void *receivedData, ssize_t *receivedBytes); - private: - int handle; - bool blocking; +public: + UDPSocket(int listening_port); + ~UDPSocket(); + bool init(); + void setBlocking(bool blocking); + bool isBlocking() { return blocking; } + int send(sockaddr *destAddress, const void *data, size_t byteLength) const; + int send(char *destAddress, int destPort, const void *data, size_t byteLength) const; + bool receive(void *receivedData, ssize_t *receivedBytes) const; + bool receive(sockaddr *recvAddress, void *receivedData, ssize_t *receivedBytes) const; +private: + int handle; + bool blocking; }; bool socketMatch(sockaddr *first, sockaddr *second); diff --git a/voxel-server/src/main.cpp b/voxel-server/src/main.cpp index 6530bc1d6f..25e86f1f8a 100644 --- a/voxel-server/src/main.cpp +++ b/voxel-server/src/main.cpp @@ -168,7 +168,7 @@ void resInVoxelDistributor(AgentList* agentList, if (agentData->getAvailable() >= bytesWritten) { agentData->writeToPacket(&tempOutputBuffer[0], bytesWritten); } else { - agentList->getAgentSocket().send(agent->getActiveSocket(), + agentList->getAgentSocket()->send(agent->getActiveSocket(), agentData->getPacket(), agentData->getPacketLength()); trueBytesSent += agentData->getPacketLength(); truePacketsSent++; @@ -178,8 +178,8 @@ void resInVoxelDistributor(AgentList* agentList, } } else { if (agentData->isPacketWaiting()) { - agentList->getAgentSocket().send(agent->getActiveSocket(), - agentData->getPacket(), agentData->getPacketLength()); + agentList->getAgentSocket()->send(agent->getActiveSocket(), + agentData->getPacket(), agentData->getPacketLength()); trueBytesSent += agentData->getPacketLength(); truePacketsSent++; agentData->resetVoxelPacket(); @@ -190,7 +190,7 @@ void resInVoxelDistributor(AgentList* agentList, } // send the environment packet int envPacketLength = environmentData.getBroadcastData(tempOutputBuffer); - agentList->getAgentSocket().send(agent->getActiveSocket(), tempOutputBuffer, envPacketLength); + agentList->getAgentSocket()->send(agent->getActiveSocket(), tempOutputBuffer, envPacketLength); trueBytesSent += envPacketLength; truePacketsSent++; @@ -288,7 +288,7 @@ void deepestLevelVoxelDistributor(AgentList* agentList, if (agentData->getAvailable() >= bytesWritten) { agentData->writeToPacket(&tempOutputBuffer[0], bytesWritten); } else { - agentList->getAgentSocket().send(agent->getActiveSocket(), + agentList->getAgentSocket()->send(agent->getActiveSocket(), agentData->getPacket(), agentData->getPacketLength()); trueBytesSent += agentData->getPacketLength(); truePacketsSent++; @@ -298,7 +298,7 @@ void deepestLevelVoxelDistributor(AgentList* agentList, } } else { if (agentData->isPacketWaiting()) { - agentList->getAgentSocket().send(agent->getActiveSocket(), + agentList->getAgentSocket()->send(agent->getActiveSocket(), agentData->getPacket(), agentData->getPacketLength()); trueBytesSent += agentData->getPacketLength(); truePacketsSent++; @@ -310,7 +310,7 @@ void deepestLevelVoxelDistributor(AgentList* agentList, } // send the environment packet int envPacketLength = environmentData.getBroadcastData(tempOutputBuffer); - agentList->getAgentSocket().send(agent->getActiveSocket(), tempOutputBuffer, envPacketLength); + agentList->getAgentSocket()->send(agent->getActiveSocket(), tempOutputBuffer, envPacketLength); trueBytesSent += envPacketLength; truePacketsSent++; @@ -501,7 +501,7 @@ int main(int argc, const char * argv[]) // check to see if we need to persist our voxel state persistVoxelsWhenDirty(); - if (agentList->getAgentSocket().receive(&agentPublicAddress, packetData, &receivedBytes)) { + if (agentList->getAgentSocket()->receive(&agentPublicAddress, packetData, &receivedBytes)) { // XXXBHG: Hacked in support for 'S' SET command if (packetData[0] == PACKET_HEADER_SET_VOXEL || packetData[0] == PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) { bool destructive = (packetData[0] == PACKET_HEADER_SET_VOXEL_DESTRUCTIVE); From 13c10c95e891a12a53e36e67508f7c99059f9ed7 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 15 May 2013 16:17:38 -0700 Subject: [PATCH 3/4] type squishes in UDPSocket header --- libraries/shared/src/UDPSocket.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/shared/src/UDPSocket.h b/libraries/shared/src/UDPSocket.h index 85c3be235a..d246d9e512 100644 --- a/libraries/shared/src/UDPSocket.h +++ b/libraries/shared/src/UDPSocket.h @@ -25,20 +25,20 @@ public: bool init(); void setBlocking(bool blocking); bool isBlocking() { return blocking; } - int send(sockaddr *destAddress, const void *data, size_t byteLength) const; - int send(char *destAddress, int destPort, const void *data, size_t byteLength) const; - bool receive(void *receivedData, ssize_t *receivedBytes) const; - bool receive(sockaddr *recvAddress, void *receivedData, ssize_t *receivedBytes) const; + int send(sockaddr* destAddress, const void* data, size_t byteLength) const; + int send(char* destAddress, int destPort, const void* data, size_t byteLength) const; + bool receive(void* receivedData, ssize_t* receivedBytes) const; + bool receive(sockaddr* recvAddress, void* receivedData, ssize_t* receivedBytes) const; private: int handle; bool blocking; }; -bool socketMatch(sockaddr *first, sockaddr *second); -int packSocket(unsigned char *packStore, in_addr_t inAddress, in_port_t networkOrderPort); -int packSocket(unsigned char *packStore, sockaddr *socketToPack); -int unpackSocket(unsigned char *packedData, sockaddr *unpackDestSocket); +bool socketMatch(sockaddr* first, sockaddr* second); +int packSocket(unsigned char* packStore, in_addr_t inAddress, in_port_t networkOrderPort); +int packSocket(unsigned char* packStore, sockaddr* socketToPack); +int unpackSocket(unsigned char* packedData, sockaddr* unpackDestSocket); int getLocalAddress(); -unsigned short loadBufferWithSocketInfo(char *addressBuffer, sockaddr *socket); +unsigned short loadBufferWithSocketInfo(char* addressBuffer, sockaddr* socket); #endif /* defined(__interface__UDPSocket__) */ From af934e2104706ba50419d53d472b9cf9042930fd Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 15 May 2013 16:19:45 -0700 Subject: [PATCH 4/4] type squishes in UDPSocket implementation --- libraries/shared/src/UDPSocket.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libraries/shared/src/UDPSocket.cpp b/libraries/shared/src/UDPSocket.cpp index a83932baa0..88930d4af4 100644 --- a/libraries/shared/src/UDPSocket.cpp +++ b/libraries/shared/src/UDPSocket.cpp @@ -27,7 +27,7 @@ using shared_lib::printLog; sockaddr_in destSockaddr, senderAddress; -bool socketMatch(sockaddr *first, sockaddr *second) { +bool socketMatch(sockaddr* first, sockaddr* second) { if (first != NULL && second != NULL) { // utility function that indicates if two sockets are equivalent @@ -51,7 +51,7 @@ bool socketMatch(sockaddr *first, sockaddr *second) { } } -int packSocket(unsigned char *packStore, in_addr_t inAddress, in_port_t networkOrderPort) { +int packSocket(unsigned char* packStore, in_addr_t inAddress, in_port_t networkOrderPort) { packStore[0] = inAddress >> 24; packStore[1] = inAddress >> 16; packStore[2] = inAddress >> 8; @@ -63,12 +63,12 @@ int packSocket(unsigned char *packStore, in_addr_t inAddress, in_port_t networkO return 6; // could be dynamically more if we need IPv6 } -int packSocket(unsigned char *packStore, sockaddr *socketToPack) { - return packSocket(packStore, ((sockaddr_in *) socketToPack)->sin_addr.s_addr, ((sockaddr_in *) socketToPack)->sin_port); +int packSocket(unsigned char* packStore, sockaddr* socketToPack) { + return packSocket(packStore, ((sockaddr_in*) socketToPack)->sin_addr.s_addr, ((sockaddr_in*) socketToPack)->sin_port); } -int unpackSocket(unsigned char *packedData, sockaddr *unpackDestSocket) { - sockaddr_in *destinationSocket = (sockaddr_in *) unpackDestSocket; +int unpackSocket(unsigned char* packedData, sockaddr* unpackDestSocket) { + sockaddr_in* destinationSocket = (sockaddr_in*) unpackDestSocket; destinationSocket->sin_addr.s_addr = (packedData[0] << 24) + (packedData[1] << 16) + (packedData[2] << 8) + packedData[3]; destinationSocket->sin_port = (packedData[4] << 8) + packedData[5]; return 6; // this could be more if we ever need IPv6 @@ -76,8 +76,8 @@ int unpackSocket(unsigned char *packedData, sockaddr *unpackDestSocket) { int getLocalAddress() { // get this agent's local address so we can pass that to DS - struct ifaddrs * ifAddrStruct = NULL; - struct ifaddrs * ifa = NULL; + struct ifaddrs* ifAddrStruct = NULL; + struct ifaddrs* ifa = NULL; int family; int localAddress = 0; @@ -107,9 +107,9 @@ int getLocalAddress() { return localAddress; } -unsigned short loadBufferWithSocketInfo(char *addressBuffer, sockaddr *socket) { +unsigned short loadBufferWithSocketInfo(char* addressBuffer, sockaddr* socket) { if (socket != NULL) { - char *copyBuffer = inet_ntoa(((sockaddr_in*) socket)->sin_addr); + char* copyBuffer = inet_ntoa(((sockaddr_in*) socket)->sin_addr); memcpy(addressBuffer, copyBuffer, strlen(copyBuffer)); return htons(((sockaddr_in*) socket)->sin_port); } else { @@ -204,12 +204,12 @@ void UDPSocket::setBlocking(bool blocking) { } // Receive data on this socket with retrieving address of sender -bool UDPSocket::receive(void *receivedData, ssize_t *receivedBytes) const { - return receive((sockaddr *)&senderAddress, receivedData, receivedBytes); +bool UDPSocket::receive(void* receivedData, ssize_t* receivedBytes) const { + return receive((sockaddr*) &senderAddress, receivedData, receivedBytes); } // Receive data on this socket with the address of the sender -bool UDPSocket::receive(sockaddr *recvAddress, void *receivedData, ssize_t *receivedBytes) const { +bool UDPSocket::receive(sockaddr* recvAddress, void* receivedData, ssize_t* receivedBytes) const { #ifdef _WIN32 int addressSize = sizeof(*recvAddress); @@ -222,7 +222,7 @@ bool UDPSocket::receive(sockaddr *recvAddress, void *receivedData, ssize_t *rece return (*receivedBytes > 0); } -int UDPSocket::send(sockaddr *destAddress, const void *data, size_t byteLength) const { +int UDPSocket::send(sockaddr* destAddress, const void* data, size_t byteLength) const { // send data via UDP int sent_bytes = sendto(handle, (const char*)data, byteLength, 0, (sockaddr *) destAddress, sizeof(sockaddr_in)); @@ -235,7 +235,7 @@ int UDPSocket::send(sockaddr *destAddress, const void *data, size_t byteLength) return sent_bytes; } -int UDPSocket::send(char * destAddress, int destPort, const void *data, size_t byteLength) const { +int UDPSocket::send(char* destAddress, int destPort, const void* data, size_t byteLength) const { // change address and port on reusable global to passed variables destSockaddr.sin_addr.s_addr = inet_addr(destAddress);