diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index fc223ab850..e9bedc5433 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -430,7 +430,7 @@ void AudioMixer::run() { qDebug() << "Dynamic jitter buffers disabled."; } - const QString DESIRED_JITTER_BUFFER_FRAMES_KEY = "B-desired-jitter-buffer-frames"; + const QString DESIRED_JITTER_BUFFER_FRAMES_KEY = "B-static-desired-jitter-buffer-frames"; _streamSettings._staticDesiredJitterBufferFrames = audioGroupObject[DESIRED_JITTER_BUFFER_FRAMES_KEY].toString().toInt(&ok); if (!ok) { _streamSettings._staticDesiredJitterBufferFrames = DEFAULT_STATIC_DESIRED_JITTER_BUFFER_FRAMES; diff --git a/domain-server/resources/web/settings/describe.json b/domain-server/resources/web/settings/describe.json index 59d99eab11..bb63c5f0a0 100644 --- a/domain-server/resources/web/settings/describe.json +++ b/domain-server/resources/web/settings/describe.json @@ -7,10 +7,10 @@ "type": "checkbox", "label": "Dynamic Jitter Buffers", "help": "Dynamically buffer client audio based on perceived jitter in packet receipt timing", - "default": false + "default": true }, - "B-desired-jitter-buffer-frames": { - "label": "Desired Jitter Buffer Frames", + "B-static-desired-jitter-buffer-frames": { + "label": "Static Desired Jitter Buffer Frames", "help": "If dynamic jitter buffers is disabled, this determines the target number of frames maintained by the AudioMixer's jitter buffers", "placeholder": "1", "default": "1" @@ -21,12 +21,12 @@ "placeholder": "10", "default": "10" }, - "D-use-stdev": { + "D-use-stdev-for-desired-calc": { "type": "checkbox", "label": "Use Stdev for Desired Jitter Frames Calc:", "help": "If checked, Philip's method (stdev of timegaps) is used to calculate desired jitter frames. Otherwise, Fred's method (max timegap) is used", "default": false - } + }, "E-window-starve-threshold": { "label": "Window Starve Threshold", "help": "If this many starves occur in an N-second window (N is the number in the next field), then the desired jitter frames will be re-evaluated using Window A.", diff --git a/libraries/audio/src/InboundAudioStream.cpp b/libraries/audio/src/InboundAudioStream.cpp index 55322d6f32..c04f9d5df1 100644 --- a/libraries/audio/src/InboundAudioStream.cpp +++ b/libraries/audio/src/InboundAudioStream.cpp @@ -246,6 +246,15 @@ void InboundAudioStream::setSettings(const Settings& settings) { setWindowStarveThreshold(settings._windowStarveThreshold); setWindowSecondsForDesiredCalcOnTooManyStarves(settings._windowSecondsForDesiredCalcOnTooManyStarves); setWindowSecondsForDesiredReduction(settings._windowSecondsForDesiredReduction); + + + printf("\n\nmax frames over desired: %d\n", settings._maxFramesOverDesired); + printf("dynamic jitter buffers: %d\n", settings._dynamicJitterBuffers); + printf("static desired jbuffer frames: %d\n", settings._staticDesiredJitterBufferFrames); + printf("use stdev: %d\n", settings._useStDevForJitterCalc); + printf("starve threshold: %d\n", settings._windowStarveThreshold); + printf("window A seconds: %d\n", settings._windowSecondsForDesiredCalcOnTooManyStarves); + printf("window B seconds: %d\n", settings._windowSecondsForDesiredReduction); } void InboundAudioStream::setDynamicJitterBuffers(bool dynamicJitterBuffers) {