changed class name to AudioStreamStats, reverted ScriptEngine packing back to QDataStream

wangyix committed 12 years ago

Commit de3c1eb1 parent c3f57177 files · +34 −41Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 7 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+17−24

                         _numAvatarSoundSentBytes = 0;
                     }
                 }
+                QByteArray audioPacket = byteArrayWithPopulatedHeader(silentFrame
+                    ? PacketTypeSilentAudioFrame
+                    : PacketTypeMicrophoneAudioNoEcho);
-                char audioPacket[MAX_PACKET_SIZE];
+                QDataStream packetStream(&audioPacket, QIODevice::Append);
-                // pack header
+                // pack a placeholder value for sequence number for now, will be packed when destination node is known
-                int numBytesPacketHeader = populatePacketHeader(audioPacket, silentFrame
+                int numPreSequenceNumberBytes = audioPacket.size();
-                                                                            ? PacketTypeSilentAudioFrame
+                packetStream << (quint16)0;
-                                                                            : PacketTypeMicrophoneAudioNoEcho);
-                char* dataAt = audioPacket + numBytesPacketHeader;
-                // skip over sequence number for now; will be packed when destination node is known
-                char* sequenceAt = dataAt;
-                dataAt += sizeof(quint16);
                 // use the orientation and position of this avatar for the source of this audio
-                memcpy(dataAt, &_avatarData->getPosition(), sizeof(glm::vec3));
+                packetStream.writeRawData(reinterpret_cast<const char*>(&_avatarData->getPosition()), sizeof(glm::vec3));
-                dataAt += sizeof(glm::vec3);
                 glm::quat headOrientation = _avatarData->getHeadOrientation();
-                memcpy(dataAt, &headOrientation, sizeof(glm::quat));
+                packetStream.writeRawData(reinterpret_cast<const char*>(&headOrientation), sizeof(glm::quat));
-                dataAt += sizeof(glm::quat);
                 if (silentFrame) {
                     if (!_isListeningToAudioStream) {
                         // if we have a silent frame and we're not listening then just send nothing and break out of here
                         break;
                     }
                     // write the number of silent samples so the audio-mixer can uphold timing
-                    memcpy(dataAt, &SCRIPT_AUDIO_BUFFER_SAMPLES, sizeof(int16_t));
+                    packetStream.writeRawData(reinterpret_cast<const char*>(&SCRIPT_AUDIO_BUFFER_SAMPLES), sizeof(int16_t));
-                    dataAt += sizeof(int16_t);
                 } else if (nextSoundOutput) {
                     // write the raw audio data
-                    int numAvailableBytes = numAvailableSamples * sizeof(int16_t);
+                    packetStream.writeRawData(reinterpret_cast<const char*>(nextSoundOutput),
-                    memcpy(dataAt, nextSoundOutput, numAvailableBytes);
+                        numAvailableSamples * sizeof(int16_t));
-                    dataAt += numAvailableBytes;
                 }
                 // write audio packet to AudioMixer nodes
-                int audioPacketSize = dataAt - audioPacket;
                 NodeList* nodeList = NodeList::getInstance();
                 foreach(const SharedNodePointer& node, nodeList->getNodeHash()) {
                     // only send to nodes of type AudioMixer
                     if (node->getType() == NodeType::AudioMixer) {
                         // pack sequence number
                         quint16 sequence = _outgoingScriptAudioSequenceNumbers[node->getUUID()]++;
-                        memcpy(sequenceAt, &sequence, sizeof(quint16));
+                        memcpy(audioPacket.data() + numPreSequenceNumberBytes, &sequence, sizeof(quint16));
                         // send audio packet
-                        nodeList->writeDatagram(audioPacket, audioPacketSize, node);
+                        nodeList->writeDatagram(audioPacket, node);
                     }
                 }
             }