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

code review comments for #4713

Browse source
This commit is contained in:
Stephen Birarda 2015-04-28 18:20:54 -07:00
parent f9a25d7089
commit c52426385d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/avatars/src/AvatarHashMap.cpp
View file

@ -11,6 +11,7 @@
#include <NodeList.h> #include <NodeList.h>
#include <PacketHeaders.h> #include <PacketHeaders.h>
#include <SharedUtil.h>
#include "AvatarLogging.h" #include "AvatarLogging.h"
#include "AvatarHashMap.h" #include "AvatarHashMap.h"
@ -25,7 +26,7 @@ AvatarHash::iterator AvatarHashMap::erase(const AvatarHash::iterator& iterator)
return _avatarHash.erase(iterator); return _avatarHash.erase(iterator);
} }
const qint64 AVATAR_SILENCE_THRESHOLD_USECS = 5 * 1000 * 1000; const qint64 AVATAR_SILENCE_THRESHOLD_USECS = 5 * USECS_PER_SECOND;
bool AvatarHashMap::shouldKillAvatar(const AvatarSharedPointer& sharedAvatar) { bool AvatarHashMap::shouldKillAvatar(const AvatarSharedPointer& sharedAvatar) {
return (sharedAvatar->getOwningAvatarMixer() == NULL return (sharedAvatar->getOwningAvatarMixer() == NULL

2
libraries/shared/src/SimpleMovingAverage.cpp
View file

@ -52,7 +52,7 @@ void SimpleMovingAverage::reset() {
float SimpleMovingAverage::getEventDeltaAverage() const { float SimpleMovingAverage::getEventDeltaAverage() const {
return (ONE_MINUS_WEIGHTING * _eventDeltaAverage) + return (ONE_MINUS_WEIGHTING * _eventDeltaAverage) +
(WEIGHTING * ((usecTimestampNow() - _lastEventTimestamp) / 1000000.0f )); (WEIGHTING * ((usecTimestampNow() - _lastEventTimestamp) / 1000000.0f));
} }
uint64_t SimpleMovingAverage::getUsecsSinceLastEvent() const { uint64_t SimpleMovingAverage::getUsecsSinceLastEvent() const {