From ffc20b8876e86fea8364a7535870ad9e8b4f8c6d Mon Sep 17 00:00:00 2001
From: wangyix <wangyix@gmail.com>
Date: Mon, 23 Jun 2014 11:22:04 -0700
Subject: [PATCH] changed InterframeTimeGapHistory to InterframeTimeGapStats

---
 assignment-client/src/audio/AvatarAudioRingBuffer.cpp |  2 +-
 libraries/audio/src/InjectedAudioRingBuffer.cpp       |  2 +-
 libraries/audio/src/PositionalAudioRingBuffer.cpp     | 10 +++++-----
 libraries/audio/src/PositionalAudioRingBuffer.h       |  6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/assignment-client/src/audio/AvatarAudioRingBuffer.cpp b/assignment-client/src/audio/AvatarAudioRingBuffer.cpp
index 0df50f99db..79ad7ae411 100644
--- a/assignment-client/src/audio/AvatarAudioRingBuffer.cpp
+++ b/assignment-client/src/audio/AvatarAudioRingBuffer.cpp
@@ -19,7 +19,7 @@ AvatarAudioRingBuffer::AvatarAudioRingBuffer(bool isStereo) :
 }
 
 int AvatarAudioRingBuffer::parseData(const QByteArray& packet) {
-    _interframeTimeGapHistory.frameReceived();
+    _interframeTimeGapStats.frameReceived();
     updateDesiredJitterBufferFrames();
 
     _shouldLoopbackForNode = (packetTypeForPacket(packet) == PacketTypeMicrophoneAudioWithEcho);
diff --git a/libraries/audio/src/InjectedAudioRingBuffer.cpp b/libraries/audio/src/InjectedAudioRingBuffer.cpp
index 80bcda5acb..ed0476f6bd 100644
--- a/libraries/audio/src/InjectedAudioRingBuffer.cpp
+++ b/libraries/audio/src/InjectedAudioRingBuffer.cpp
@@ -31,7 +31,7 @@ InjectedAudioRingBuffer::InjectedAudioRingBuffer(const QUuid& streamIdentifier)
 const uchar MAX_INJECTOR_VOLUME = 255;
 
 int InjectedAudioRingBuffer::parseData(const QByteArray& packet) {
-    _interframeTimeGapHistory.frameReceived();
+    _interframeTimeGapStats.frameReceived();
     updateDesiredJitterBufferFrames();
 
     // setup a data stream to read from this packet
diff --git a/libraries/audio/src/PositionalAudioRingBuffer.cpp b/libraries/audio/src/PositionalAudioRingBuffer.cpp
index 7c2369d7e5..a22f57f3d7 100644
--- a/libraries/audio/src/PositionalAudioRingBuffer.cpp
+++ b/libraries/audio/src/PositionalAudioRingBuffer.cpp
@@ -21,7 +21,7 @@
 #include "PositionalAudioRingBuffer.h"
 #include "SharedUtil.h"
 
-InterframeTimeGapHistory::InterframeTimeGapHistory()
+InterframeTimeGapStats::InterframeTimeGapStats()
     : _lastFrameReceivedTime(0),
     _numSamplesInCurrentInterval(0),
     _currentIntervalMaxGap(0),
@@ -32,7 +32,7 @@ InterframeTimeGapHistory::InterframeTimeGapHistory()
     memset(_intervalMaxGaps, 0, TIME_GAP_NUM_INTERVALS_IN_WINDOW*sizeof(quint64));
 }
 
-void InterframeTimeGapHistory::frameReceived() {
+void InterframeTimeGapStats::frameReceived() {
     quint64 now = usecTimestampNow();
 
     // make sure this isn't the first time frameReceived() is called so can actually calculate a gap.
@@ -79,7 +79,7 @@ void InterframeTimeGapHistory::frameReceived() {
     _lastFrameReceivedTime = now;
 }
 
-quint64 InterframeTimeGapHistory::getWindowMaxGap() {
+quint64 InterframeTimeGapStats::getWindowMaxGap() {
     _newWindowMaxGapAvailable = false;
     return _windowMaxGap;
 }
@@ -234,8 +234,8 @@ void PositionalAudioRingBuffer::updateDesiredJitterBufferFrames() {
 
     const float USECS_PER_FRAME = NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL * USECS_PER_SECOND / (float)SAMPLE_RATE;
 
-    if (_interframeTimeGapHistory.hasNewWindowMaxGapAvailable()) {
-        _desiredJitterBufferFrames = ceilf((float)_interframeTimeGapHistory.getWindowMaxGap() / USECS_PER_FRAME);
+    if (_interframeTimeGapStats.hasNewWindowMaxGapAvailable()) {
+        _desiredJitterBufferFrames = ceilf((float)_interframeTimeGapStats.getWindowMaxGap() / USECS_PER_FRAME);
         if (_desiredJitterBufferFrames < 1) {
             _desiredJitterBufferFrames = 1;
         }
diff --git a/libraries/audio/src/PositionalAudioRingBuffer.h b/libraries/audio/src/PositionalAudioRingBuffer.h
index 5fa24ff782..8c2122f29e 100644
--- a/libraries/audio/src/PositionalAudioRingBuffer.h
+++ b/libraries/audio/src/PositionalAudioRingBuffer.h
@@ -23,9 +23,9 @@ const int TIME_GAP_NUM_SAMPLES_IN_INTERVAL = 500;
 const int TIME_GAP_NUM_INTERVALS_IN_WINDOW = 10;
 
 // class used to track time between incoming frames for the purpose of varying the jitter buffer length
-class InterframeTimeGapHistory {
+class InterframeTimeGapStats {
 public:
-    InterframeTimeGapHistory();
+    InterframeTimeGapStats();
 
     void frameReceived();
     bool hasNewWindowMaxGapAvailable() const { return _newWindowMaxGapAvailable; }
@@ -95,7 +95,7 @@ protected:
     float _nextOutputTrailingLoudness;
     AABox* _listenerUnattenuatedZone;
 
-    InterframeTimeGapHistory _interframeTimeGapHistory;
+    InterframeTimeGapStats _interframeTimeGapStats;
     int _desiredJitterBufferFrames;
     int _currentJitterBufferFrames;
 };