From 7b8f61609935486944e4f69deb5c0d0795a9563c Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Thu, 8 Sep 2016 17:20:40 -0700
Subject: [PATCH] add audiostream (jitter) logging

---
 libraries/audio/src/AudioLogging.cpp       |  6 ++++++
 libraries/audio/src/AudioLogging.h         |  1 +
 libraries/audio/src/InboundAudioStream.cpp | 11 +++++++++++
 3 files changed, 18 insertions(+)

diff --git a/libraries/audio/src/AudioLogging.cpp b/libraries/audio/src/AudioLogging.cpp
index f01b8ce846..9bb44f5be6 100644
--- a/libraries/audio/src/AudioLogging.cpp
+++ b/libraries/audio/src/AudioLogging.cpp
@@ -12,3 +12,9 @@
 #include "AudioLogging.h"
 
 Q_LOGGING_CATEGORY(audio, "hifi.audio")
+
+#if DEV_BUILD || PR_BUILD
+Q_LOGGING_CATEGORY(audiostream, "hifi.audio-stream", QtDebugMsg)
+#else
+Q_LOGGING_CATEGORY(audiostream, "hifi.audio-stream", QtInfoMsg)
+#endif
diff --git a/libraries/audio/src/AudioLogging.h b/libraries/audio/src/AudioLogging.h
index c15e53be41..71e22e952c 100644
--- a/libraries/audio/src/AudioLogging.h
+++ b/libraries/audio/src/AudioLogging.h
@@ -15,5 +15,6 @@
 #include <QLoggingCategory>
 
 Q_DECLARE_LOGGING_CATEGORY(audio)
+Q_DECLARE_LOGGING_CATEGORY(audiostream)
 
 #endif // hifi_AudioLogging_h
diff --git a/libraries/audio/src/InboundAudioStream.cpp b/libraries/audio/src/InboundAudioStream.cpp
index 6b79879bb7..7acefd30b8 100644
--- a/libraries/audio/src/InboundAudioStream.cpp
+++ b/libraries/audio/src/InboundAudioStream.cpp
@@ -16,6 +16,7 @@
 #include <NodeList.h>
 
 #include "InboundAudioStream.h"
+#include "AudioLogging.h"
 
 const int STARVE_HISTORY_CAPACITY = 50;
 
@@ -174,6 +175,9 @@ int InboundAudioStream::parseData(ReceivedMessage& message) {
         _currentJitterBufferFrames = 0;
 
         _oldFramesDropped += framesToDrop;
+
+        qCDebug(audiostream, "Dropped %d frames", framesToDrop);
+        qCDebug(audiostream, "Resetted current jitter frames");
     }
 
     framesAvailableChanged();
@@ -228,6 +232,9 @@ int InboundAudioStream::writeDroppableSilentSamples(int silentSamples) {
         _currentJitterBufferFrames -= numSilentFramesToDrop;
         _silentFramesDropped += numSilentFramesToDrop;
 
+        qCDebug(audiostream, "Dropped %d silent frames", numSilentFramesToDrop);
+        qCDebug(audiostream, "Set current jitter frames to %d", _currentJitterBufferFrames);
+
         _framesAvailableStat.reset();
     }
 
@@ -308,6 +315,8 @@ void InboundAudioStream::framesAvailableChanged() {
 
     if (_framesAvailableStat.getElapsedUsecs() >= FRAMES_AVAILABLE_STAT_WINDOW_USECS) {
         _currentJitterBufferFrames = (int)ceil(_framesAvailableStat.getAverage());
+        qCDebug(audiostream, "Set current jitter frames to %d", _currentJitterBufferFrames);
+
         _framesAvailableStat.reset();
     }
 }
@@ -355,6 +364,7 @@ void InboundAudioStream::setToStarved() {
             // make sure _desiredJitterBufferFrames does not become lower here
             if (calculatedJitterBufferFrames >= _desiredJitterBufferFrames) {
                 _desiredJitterBufferFrames = calculatedJitterBufferFrames;
+                qCDebug(audiostream, "Set desired jitter frames to %d", _desiredJitterBufferFrames);
             }
         }
     }
@@ -444,6 +454,7 @@ void InboundAudioStream::packetReceivedUpdateTimingStats() {
                                                          / (float)AudioConstants::NETWORK_FRAME_USECS);
                 if (calculatedJitterBufferFrames < _desiredJitterBufferFrames) {
                     _desiredJitterBufferFrames = calculatedJitterBufferFrames;
+                    qCDebug(audiostream, "Set desired jitter frames to %d", _desiredJitterBufferFrames);
                 }
                 _timeGapStatsForDesiredReduction.clearNewStatsAvailableFlag();
             }