Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:33:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

complete initial algorithm for AM throttle

Browse source
This commit is contained in:
Stephen Birarda 2015-05-01 14:56:40 -07:00
parent 7a2a391852
commit 532bcc9376
3 changed files with 32 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -166,7 +166,7 @@ void AvatarMixer::broadcastAvatarData() {
distribution.reset();
// reset the max distance for this frame
float maxDistanceThisFrame = 0.0f;
float maxAvatarDistanceThisFrame = 0.0f;
// reset the number of sent avatars
nodeData->resetNumAvatarsSentLastFrame();
@ -186,6 +186,12 @@ void AvatarMixer::broadcastAvatarData() {
if (nodeData->getNumFramesSinceFRDAdjustment() > AVATAR_MIXER_BROADCAST_FRAMES_PER_SECOND) {
const float FRD_ADJUSTMENT_ACCEPTABLE_RATIO = 0.8f;
const float HYSTERISIS_GAP = (1 - FRD_ADJUSTMENT_ACCEPTABLE_RATIO);
const float HYSTERISIS_MIDDLE_PERCENTAGE = (1 - (HYSTERISIS_GAP * 0.5f));
const float FRD_RECOVERY_EPSILON = 0.0001;
// get the current full rate distance so we can work with it
float currentFullRateDistance = nodeData->getFullRateDistance();
// qDebug() << "current node outbound bandwidth is" << avatarDataRateLastSecond;
@ -194,40 +200,30 @@ void AvatarMixer::broadcastAvatarData() {
qDebug() << "Adjustment down required for avatar" << node->getUUID() << "whose current send rate is"
<< avatarDataRateLastSecond;
// is the FRD greater than the MAX FRD? if so, before we calculate anything, set it to the MAX FRD
float newFullRateDistance = nodeData->getFullRateDistance();
// is the FRD greater than the farthest avatar?
// if so, before we calculate anything, set it to that distance
currentFullRateDistance = std::min(currentFullRateDistance, nodeData->getMaxAvatarDistance());
if (newFullRateDistance > nodeData->getMaxFullRateDistance()) {
newFullRateDistance = nodeData->getMaxFullRateDistance();
}
// we're adjusting the full rate distance to target a bandwidth in the middle
// of the hysterisis gap
// we're adjusting, so we want to drop half the distance to FRD=0
newFullRateDistance /= 2.0f;
currentFullRateDistance *= (_maxKbpsPerNode * HYSTERISIS_MIDDLE_PERCENTAGE) / avatarDataRateLastSecond;
qDebug() << "max FRD is" << nodeData->getMaxFullRateDistance();
qDebug() << "farthest possible FRD is" << nodeData->getMaxAvatarDistance();
qDebug() << "current FRD is" << nodeData->getFullRateDistance();
nodeData->setFullRateDistance(newFullRateDistance);
nodeData->setFullRateDistance(currentFullRateDistance);
qDebug() << "new FRD is" << nodeData->getFullRateDistance();
nodeData->resetNumFramesSinceFRDAdjustment();
} else if (nodeData->getFullRateDistance() < nodeData->getMaxFullRateDistance()
} else if (currentFullRateDistance < nodeData->getMaxAvatarDistance()
&& avatarDataRateLastSecond < _maxKbpsPerNode * FRD_ADJUSTMENT_ACCEPTABLE_RATIO) {
// we are constrained AND we've recovered to below the acceptable ratio, adjust the FRD upwards
// by covering half the distance to the max FRD
// we are constrained AND we've recovered to below the acceptable ratio
qDebug() << "Adjustment up required for avatar" << node->getUUID() << "whose current send rate is"
<< node->getOutboundBandwidth();
float newFullRateDistance = nodeData->getFullRateDistance();
newFullRateDistance += (nodeData->getMaxFullRateDistance() - newFullRateDistance) / 2.0f;
qDebug() << "max FRD is" << nodeData->getMaxFullRateDistance();
qDebug() << "current FRD is" << nodeData->getFullRateDistance();
nodeData->setFullRateDistance(newFullRateDistance);
qDebug() << "new FRD is" << nodeData->getFullRateDistance();
// lets adjust the full rate distance to target a bandwidth in the middle of the hyterisis gap
currentFullRateDistance *= (_maxKbpsPerNode * HYSTERISIS_MIDDLE_PERCENTAGE) / avatarDataRateLastSecond;
nodeData->setFullRateDistance(currentFullRateDistance);
nodeData->resetNumFramesSinceFRDAdjustment();
}
} else {
@ -265,7 +261,7 @@ void AvatarMixer::broadcastAvatarData() {
float distanceToAvatar = glm::length(myPosition - otherPosition);
// potentially update the max full rate distance for this frame
maxDistanceThisFrame = std::max(maxDistanceThisFrame, distanceToAvatar);
maxAvatarDistanceThisFrame = std::max(maxAvatarDistanceThisFrame, distanceToAvatar);
if (distanceToAvatar != 0.0f
&& distribution(generator) > (nodeData->getFullRateDistance() / distanceToAvatar)) {
@ -305,7 +301,6 @@ void AvatarMixer::broadcastAvatarData() {
billboardPacket.append(otherNode->getUUID().toRfc4122());
billboardPacket.append(otherNodeData->getAvatar().getBillboard());
qDebug() << "Sending a billboard packet to" << node->getUUID();
nodeList->writeDatagram(billboardPacket, node);
++_sumBillboardPackets;
@ -322,8 +317,6 @@ void AvatarMixer::broadcastAvatarData() {
individualData.replace(0, NUM_BYTES_RFC4122_UUID, otherNode->getUUID().toRfc4122());
identityPacket.append(individualData);
qDebug() << "Sending an identity packet to" << node->getUUID();
nodeList->writeDatagram(identityPacket, node);
++_sumIdentityPackets;
@ -338,9 +331,9 @@ void AvatarMixer::broadcastAvatarData() {
if (numOtherAvatars == 0) {
// update the full rate distance to FLOAT_MAX since we didn't have any other avatars to send
nodeData->setMaxFullRateDistance(FLT_MAX);
nodeData->setMaxAvatarDistance(FLT_MAX);
} else {
nodeData->setMaxFullRateDistance(maxDistanceThisFrame);
nodeData->setMaxAvatarDistance(maxAvatarDistanceThisFrame);
}
}
);

2
assignment-client/src/avatars/AvatarMixerClientData.cpp
View file

@ -28,7 +28,7 @@ bool AvatarMixerClientData::checkAndSetHasReceivedFirstPackets() {
void AvatarMixerClientData::loadJSONStats(QJsonObject& jsonObject) const {
jsonObject["display_name"] = _avatar.getDisplayName();
jsonObject["full_rate_distance"] = _fullRateDistance;
jsonObject["max_full_rate_distance"] = _maxFullRateDistance;
jsonObject["max_avatar_distance"] = _maxAvatarDistance;
jsonObject["num_avatars_sent_last_frame"] = _numAvatarsSentLastFrame;
jsonObject[OUTBOUND_AVATAR_DATA_STATS_KEY] = getOutboundAvatarDataKbps();

8
assignment-client/src/avatars/AvatarMixerClientData.h
View file

@ -39,11 +39,11 @@ public:
quint64 getIdentityChangeTimestamp() const { return _identityChangeTimestamp; }
void setIdentityChangeTimestamp(quint64 identityChangeTimestamp) { _identityChangeTimestamp = identityChangeTimestamp; }
float getFullRateDistance() const { return _fullRateDistance; }
void setFullRateDistance(float fullRateDistance) { _fullRateDistance = fullRateDistance; }
float getFullRateDistance() const { return _fullRateDistance; }
void setMaxFullRateDistance(float maxFullRateDistance) { _maxFullRateDistance = maxFullRateDistance; }
float getMaxFullRateDistance() const { return _maxFullRateDistance; }
void setMaxAvatarDistance(float maxAvatarDistance) { _maxAvatarDistance = maxAvatarDistance; }
float getMaxAvatarDistance() const { return _maxAvatarDistance; }
void resetNumAvatarsSentLastFrame() { _numAvatarsSentLastFrame = 0; }
void incrementNumAvatarsSentLastFrame() { ++_numAvatarsSentLastFrame; }
@ -65,7 +65,7 @@ private:
quint64 _billboardChangeTimestamp = 0;
quint64 _identityChangeTimestamp = 0;
float _fullRateDistance = FLT_MAX;
float _maxFullRateDistance = FLT_MAX;
float _maxAvatarDistance = FLT_MAX;
int _numAvatarsSentLastFrame = 0;
int _numFramesSinceAdjustment = 0;
SimpleMovingAverage _avgOtherAvatarDataRate;