Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 15:33:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2

zappoman's feedback, plus added const corrrectness to computeLoudness

Browse source
This commit is contained in:
David Kelly 2017-02-28 13:24:25 -07:00
parent 0b8624aa6f
commit 2635657456
2 changed files with 8 additions and 6 deletions
assignment-client/src
Agent.cppAgent.h

4
assignment-client/src/Agent.cpp
View file

@ -380,6 +380,8 @@ void Agent::executeScript() {
audioTransform.setTranslation(scriptedAvatar->getPosition());
audioTransform.setRotation(headOrientation);
computeLoudness(&audio);
QByteArray encodedBuffer;
if (_encoder) {
_encoder->encode(audio, encodedBuffer);
@ -571,7 +573,7 @@ void Agent::encodeFrameOfZeros(QByteArray& encodedZeros) {
}
}
void Agent::computeLoudness(QByteArray* decodedBuffer) {
void Agent::computeLoudness(const QByteArray* decodedBuffer) {
float loudness = 0.0f;
auto scriptedAvatar = DependencyManager::get<ScriptableAvatar>();
if (decodedBuffer) {

10
assignment-client/src/Agent.h
View file

@ -68,10 +68,10 @@ private slots:
void handleAudioPacket(QSharedPointer<ReceivedMessage> message);
void handleOctreePacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
void handleJurisdictionPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
void handleSelectedAudioFormat(QSharedPointer<ReceivedMessage> message);
void handleSelectedAudioFormat(QSharedPointer<ReceivedMessage> message);
void nodeActivated(SharedNodePointer activatedNode);
void processAgentAvatar();
void processAgentAvatarAudio();
@ -82,7 +82,7 @@ private:
void negotiateAudioFormat();
void selectAudioFormat(const QString& selectedCodecName);
void encodeFrameOfZeros(QByteArray& encodedZeros);
void computeLoudness(QByteArray* decodedBuffer);
void computeLoudness(const QByteArray* decodedBuffer);
std::unique_ptr<ScriptEngine> _scriptEngine;
EntityEditPacketSender _entityEditSender;
@ -104,10 +104,10 @@ private:
bool _isAvatar = false;
QTimer* _avatarIdentityTimer = nullptr;
QHash<QUuid, quint16> _outgoingScriptAudioSequenceNumbers;
CodecPluginPointer _codec;
QString _selectedCodecName;
Encoder* _encoder { nullptr };
Encoder* _encoder { nullptr };
QThread _avatarAudioTimerThread;
bool _flushEncoder { false };
};