Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 13:50:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

default max frames over desired changed to 10

Browse source
This commit is contained in:
wangyix 2014-07-29 17:37:59 -07:00
parent bcf9a3c20c
commit ecfd5c2757
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assignment-client/src/audio/AudioMixer.cpp
View file

@ -68,7 +68,7 @@ void attachNewNodeDataToNode(Node *newNode) {
} }
bool AudioMixer::_useDynamicJitterBuffers = false; bool AudioMixer::_useDynamicJitterBuffers = false;
int AudioMixer::_maxFramesOverDesired = 20; int AudioMixer::_maxFramesOverDesired = 0;
AudioMixer::AudioMixer(const QByteArray& packet) : AudioMixer::AudioMixer(const QByteArray& packet) :
ThreadedAssignment(packet), ThreadedAssignment(packet),
@ -472,7 +472,11 @@ void AudioMixer::run() {
} }
const QString MAX_FRAMES_OVER_DESIRED_JSON_KEY = "max-frames-over-desired"; const QString MAX_FRAMES_OVER_DESIRED_JSON_KEY = "max-frames-over-desired";
_maxFramesOverDesired = audioGroupObject[MAX_FRAMES_OVER_DESIRED_JSON_KEY].toString().toInt(); bool ok;
_maxFramesOverDesired = audioGroupObject[MAX_FRAMES_OVER_DESIRED_JSON_KEY].toString().toInt(&ok);
if (!ok) {
_maxFramesOverDesired = DEFAULT_MAX_FRAMES_OVER_DESIRED;
}
qDebug() << "Max frames over desired:" << _maxFramesOverDesired; qDebug() << "Max frames over desired:" << _maxFramesOverDesired;
} }

2
domain-server/resources/web/settings/describe.json
View file

@ -12,7 +12,7 @@
"max-frames-over-desired": { "max-frames-over-desired": {
"label": "Max Frames Over Desired", "label": "Max Frames Over Desired",
"help": "The highest number of frames an AudioMixer's ringbuffer can exceed the desired jitter buffer frames by", "help": "The highest number of frames an AudioMixer's ringbuffer can exceed the desired jitter buffer frames by",
"placeholder": "20", "placeholder": "10",
"default": "" "default": ""
}, },
"dynamic-jitter-buffer": { "dynamic-jitter-buffer": {

2
interface/src/Menu.h
View file

@ -47,8 +47,6 @@ const float ADJUST_LOD_MAX_SIZE_SCALE = DEFAULT_OCTREE_SIZE_SCALE;
const float MINIMUM_AVATAR_LOD_DISTANCE_MULTIPLIER = 0.1f; const float MINIMUM_AVATAR_LOD_DISTANCE_MULTIPLIER = 0.1f;
const float MAXIMUM_AVATAR_LOD_DISTANCE_MULTIPLIER = 15.0f; const float MAXIMUM_AVATAR_LOD_DISTANCE_MULTIPLIER = 15.0f;
const int DEFAULT_MAX_FRAMES_OVER_DESIRED = 20;
enum FrustumDrawMode { enum FrustumDrawMode {
FRUSTUM_DRAW_MODE_ALL, FRUSTUM_DRAW_MODE_ALL,
FRUSTUM_DRAW_MODE_VECTORS, FRUSTUM_DRAW_MODE_VECTORS,

2
libraries/audio/src/InboundAudioStream.h
View file

@ -45,6 +45,8 @@ const int INCOMING_SEQ_STATS_HISTORY_LENGTH_SECONDS = 30;
const int INBOUND_RING_BUFFER_FRAME_CAPACITY = 100; const int INBOUND_RING_BUFFER_FRAME_CAPACITY = 100;
const int DEFAULT_MAX_FRAMES_OVER_DESIRED = 10;
class InboundAudioStream : public NodeData { class InboundAudioStream : public NodeData {
Q_OBJECT Q_OBJECT