Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:47:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

update audio client packet send to NLPacket

Browse source
This commit is contained in:
Stephen Birarda 2015-07-07 10:53:55 -07:00
parent e1c098233a
commit edf7a96b58
3 changed files with 33 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
libraries/audio-client/src/AudioClient.cpp
View file

@ -724,20 +724,18 @@ void AudioClient::handleLocalEchoAndReverb(QByteArray& inputByteArray) {
}
void AudioClient::handleAudioInput() {
static char audioDataPacket[MAX_PACKET_SIZE];
static int numBytesPacketHeader = numBytesForPacketHeaderGivenPacketType(PacketTypeMicrophoneAudioNoEcho);
// NOTE: we assume PacketTypeMicrophoneAudioWithEcho has same size headers as
// PacketTypeMicrophoneAudioNoEcho. If not, then networkAudioSamples will be pointing to the wrong place for writing
// audio samples with echo.
static int leadingBytes = numBytesPacketHeader + sizeof(quint16) + sizeof(glm::vec3) + sizeof(glm::quat) + sizeof(quint8);
static int16_t* networkAudioSamples = (int16_t*)(audioDataPacket + leadingBytes);
if (!_audioPacket) {
// we don't have an audioPacket yet - set that up now
_audioPacket = NLPacket::create(PacketType::MicrophoneAudioNoEcho);
}
float inputToNetworkInputRatio = calculateDeviceToNetworkInputRatio();
int inputSamplesRequired = (int)((float)AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL * inputToNetworkInputRatio);
static int leadingBytes = sizeof(quint16) + sizeof(glm::vec3) + sizeof(glm::quat) + sizeof(quint8);
int16_t* networkAudioSamples = (int16_t*)(_audioPacket->payload() + leadingBytes);
QByteArray inputByteArray = _inputDevice->readAll();
// Add audio source injection if enabled
@ -769,7 +767,7 @@ void AudioClient::handleAudioInput() {
while (_inputRingBuffer.samplesAvailable() >= inputSamplesRequired) {
const int numNetworkBytes = _isStereoInput
? AudioConstants::NETWORK_FRAME_BYTES_STEREO
? AudioConstants::NETWORK_FRAME_BYTES_STEREO`
: AudioConstants::NETWORK_FRAME_BYTES_PER_CHANNEL;
const int numNetworkSamples = _isStereoInput
? AudioConstants::NETWORK_FRAME_SAMPLES_STEREO
@ -846,57 +844,49 @@ void AudioClient::handleAudioInput() {
PacketType::Value packetType;
if (_lastInputLoudness == 0) {
packetType = PacketTypeSilentAudioFrame;
_audioPacket->setType(PacketType::SilentAudioFrame);
} else {
if (_shouldEchoToServer) {
packetType = PacketTypeMicrophoneAudioWithEcho;
_audioPacket->setType(PacketType::MicrophoneAudioWithEcho);
} else {
packetType = PacketTypeMicrophoneAudioNoEcho;
_audioPacket->setType(PacketType::MicrophoneAudioNoEcho);
}
}
char* currentPacketPtr = audioDataPacket + nodeList->populatePacketHeader(audioDataPacket, packetType);
// seek to the beginning of the audio packet payload
_audioPacket->seek(0);
// pack sequence number
memcpy(currentPacketPtr, &_outgoingAvatarAudioSequenceNumber, sizeof(quint16));
currentPacketPtr += sizeof(quint16);
// reset the size used in this packet so it will be correct once we are done writing
_audioPacket->setSizeUsed(0);
if (packetType == PacketTypeSilentAudioFrame) {
// write sequence number
_audioPacket->write(&_outgoingAvatarAudioSequenceNumber, sizeof(quint16));
if (packetType == PacketType::SilentAudioFrame) {
// pack num silent samples
quint16 numSilentSamples = numNetworkSamples;
memcpy(currentPacketPtr, &numSilentSamples, sizeof(quint16));
currentPacketPtr += sizeof(quint16);
// memcpy the three float positions
memcpy(currentPacketPtr, &headPosition, sizeof(headPosition));
currentPacketPtr += (sizeof(headPosition));
// memcpy our orientation
memcpy(currentPacketPtr, &headOrientation, sizeof(headOrientation));
currentPacketPtr += sizeof(headOrientation);
_audioPacket->write(&numSilentSamples, sizeof(quint16));
} else {
// set the mono/stereo byte
*currentPacketPtr++ = isStereo;
_audioPacket->write(&isStereo, sizeof(isStereo));
}
// memcpy the three float positions
memcpy(currentPacketPtr, &headPosition, sizeof(headPosition));
currentPacketPtr += (sizeof(headPosition));
// pack the three float positions
_audioPacket->write(&headPosition, sizeof(headPosition));
// memcpy our orientation
memcpy(currentPacketPtr, &headOrientation, sizeof(headOrientation));
currentPacketPtr += sizeof(headOrientation);
// pack the orientation
_audioPacket->write(&headOrientation, sizeof(headOrientation));
if (packetType != PacketType::SilentAudioFrame) {
// audio samples have already been packed (written to networkAudioSamples)
currentPacketPtr += numNetworkBytes;
_audioPacket->setSizeUsed(_audioPacket->getSizeUsed() + numNetworkBytes);
}
_stats.sentPacket();
nodeList->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SendAudioPacket);
int packetBytes = currentPacketPtr - audioDataPacket;
nodeList->writeDatagram(audioDataPacket, packetBytes, audioMixer);
nodeList->sendUnreliablePacket(_audioPacket, audioMixer);
_outgoingAvatarAudioSequenceNumber++;
}
}

2
libraries/audio-client/src/AudioClient.h
View file

@ -308,6 +308,8 @@ private:
void checkDevices();
bool _hasReceivedFirstPacket = false;
std::unique_ptr<NLPacket> _audioPacket;
};

1
libraries/networking/src/NodeList.cpp
View file

@ -552,6 +552,7 @@ int NodeList::processDomainServerList(const QByteArray& packet) {
packetStream >> newUUID;
setSessionUUID(newUUID);
// TODO: when fixing this read these are actually chars now, not bools
bool thisNodeCanAdjustLocks;
packetStream >> thisNodeCanAdjustLocks;
setThisNodeCanAdjustLocks(thisNodeCanAdjustLocks);