From 977cda3d2e7cb6de094cf6f077ad2deb477ab9af Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Wed, 21 Dec 2016 19:10:19 -0800 Subject: [PATCH] adjust audio loudness radix so we can support the entire range --- libraries/avatars/src/AvatarData.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 6ab12f9b66..8e1d708182 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -51,7 +51,7 @@ const QString AvatarData::FRAME_NAME = "com.highfidelity.recording.AvatarData"; static const int TRANSLATION_COMPRESSION_RADIX = 12; static const int SENSOR_TO_WORLD_SCALE_RADIX = 10; -static const int AUDIO_LOUDNESS_RADIX = 10; +static const int AUDIO_LOUDNESS_RADIX = 2; #define ASSERT(COND) do { if (!(COND)) { abort(); } } while(0) @@ -193,7 +193,8 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail) { avatarInfo->lookAtPosition[1] = _headData->_lookAtPosition.y; avatarInfo->lookAtPosition[2] = _headData->_lookAtPosition.z; - packFloatScalarToSignedTwoByteFixed((uint8_t*)&avatarInfo->audioLoudness, _headData->_audioLoudness, AUDIO_LOUDNESS_RADIX); + packFloatScalarToSignedTwoByteFixed((uint8_t*)&avatarInfo->audioLoudness, + glm::min(_headData->_audioLoudness, MAX_AUDIO_LOUDNESS), AUDIO_LOUDNESS_RADIX); glm::mat4 sensorToWorldMatrix = getSensorToWorldMatrix(); packOrientationQuatToSixBytes(avatarInfo->sensorToWorldQuat, glmExtractRotation(sensorToWorldMatrix));