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

packet repairs for AudioInjector

Browse source
This commit is contained in:
Stephen Birarda 2015-07-07 15:50:32 -07:00
parent e35217836f
commit eac3a2a640
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -153,7 +153,7 @@ void AudioInjector::injectToMixer() {
// make sure we actually have samples downloaded to inject // make sure we actually have samples downloaded to inject
if (_audioData.size()) { if (_audioData.size()) {
auto audioPacket { NLPacket::create(PacketType::InjectAudio); } auto audioPacket = NLPacket::create(PacketType::InjectAudio);
// setup the packet for injected audio // setup the packet for injected audio
QDataStream audioPacketStream(&audioPacket); QDataStream audioPacketStream(&audioPacket);
@ -177,7 +177,6 @@ void AudioInjector::injectToMixer() {
sizeof(_options.position)); sizeof(_options.position));
// pack our orientation for injected audio // pack our orientation for injected audio
int orientationOptionOffset = audioPacket.pos();
audioPacketStream.writeRawData(reinterpret_cast<const char*>(&_options.orientation), audioPacketStream.writeRawData(reinterpret_cast<const char*>(&_options.orientation),
sizeof(_options.orientation)); sizeof(_options.orientation));
@ -216,23 +215,24 @@ void AudioInjector::injectToMixer() {
} }
_loudness /= (float)(bytesToCopy / sizeof(int16_t)); _loudness /= (float)(bytesToCopy / sizeof(int16_t));
audioPacket.seek(positionOptionOffset); audioPacket->seek(positionOptionOffset);
audioPacket.write(&_options.position, sizeof(_options.position)); audioPacket->write(&_options.position, sizeof(_options.position));
audioPacket.seek(orientationOptionOffset);
audioPacket.write(&_options.orientation, sizeof(_options.orientation)); audioPacket.write(&_options.orientation, sizeof(_options.orientation));
volume = MAX_INJECTOR_VOLUME * _options.volume; volume = MAX_INJECTOR_VOLUME * _options.volume;
audioPacket.seek(volumeOptionOffset); audioPacket->seek(volumeOptionOffset);
audioPacket.write(&volume, sizeof(volume)); audioPacket->write(&volume, sizeof(volume));
audioPacket.seek(audioDataOffset); audioPacket->seek(audioDataOffset);
// pack the sequence number // pack the sequence number
audioPacket.write(&outgoingInjectedAudioSequenceNumber, sizeof(quint16)); audioPacket->write(&outgoingInjectedAudioSequenceNumber, sizeof(quint16));
// copy the next NETWORK_BUFFER_LENGTH_BYTES_PER_CHANNEL bytes to the packet // copy the next NETWORK_BUFFER_LENGTH_BYTES_PER_CHANNEL bytes to the packet
audioPacket.write(_audioData.data() + _currentSendPosition, bytesToCopy); audioPacket->write(_audioData.data() + _currentSendPosition, bytesToCopy);
// set the correct size used for this packet
audioPacket->setSizeUsed(audioPacket->pos());
// grab our audio mixer from the NodeList, if it exists // grab our audio mixer from the NodeList, if it exists
SharedNodePointer audioMixer = nodeList->soloNodeOfType(NodeType::AudioMixer); SharedNodePointer audioMixer = nodeList->soloNodeOfType(NodeType::AudioMixer);