From ecfd5c275710f436fe6523544e05c7b3e376081c Mon Sep 17 00:00:00 2001
From: wangyix <wangyix@gmail.com>
Date: Tue, 29 Jul 2014 17:37:59 -0700
Subject: [PATCH] default max frames over desired changed to 10

---
 assignment-client/src/audio/AudioMixer.cpp         | 8 ++++++--
 domain-server/resources/web/settings/describe.json | 2 +-
 interface/src/Menu.h                               | 2 --
 libraries/audio/src/InboundAudioStream.h           | 2 ++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 5f52a175cc..d81b8336f0 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -68,7 +68,7 @@ void attachNewNodeDataToNode(Node *newNode) {
 }
 
 bool AudioMixer::_useDynamicJitterBuffers = false;
-int AudioMixer::_maxFramesOverDesired = 20;
+int AudioMixer::_maxFramesOverDesired = 0;
 
 AudioMixer::AudioMixer(const QByteArray& packet) :
     ThreadedAssignment(packet),
@@ -472,7 +472,11 @@ void AudioMixer::run() {
         }
 
         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;
     }
     
diff --git a/domain-server/resources/web/settings/describe.json b/domain-server/resources/web/settings/describe.json
index 7cba68e795..3eff806c1a 100644
--- a/domain-server/resources/web/settings/describe.json
+++ b/domain-server/resources/web/settings/describe.json
@@ -12,7 +12,7 @@
 	  "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",
-        "placeholder": "20",
+        "placeholder": "10",
         "default": ""
       },
       "dynamic-jitter-buffer": {
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 66c4115927..2bc750007a 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -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 MAXIMUM_AVATAR_LOD_DISTANCE_MULTIPLIER = 15.0f;
 
-const int DEFAULT_MAX_FRAMES_OVER_DESIRED = 20;
-
 enum FrustumDrawMode {
     FRUSTUM_DRAW_MODE_ALL,
     FRUSTUM_DRAW_MODE_VECTORS,
diff --git a/libraries/audio/src/InboundAudioStream.h b/libraries/audio/src/InboundAudioStream.h
index 4b1db354c1..a63e09320a 100644
--- a/libraries/audio/src/InboundAudioStream.h
+++ b/libraries/audio/src/InboundAudioStream.h
@@ -45,6 +45,8 @@ const int INCOMING_SEQ_STATS_HISTORY_LENGTH_SECONDS = 30;
 
 const int INBOUND_RING_BUFFER_FRAME_CAPACITY = 100;
 
+const int DEFAULT_MAX_FRAMES_OVER_DESIRED = 10;
+
 
 class InboundAudioStream : public NodeData {
     Q_OBJECT