From 553fffd8aee5332b778793920071c1f4714c7373 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zmp@umich.edu>
Date: Tue, 7 Feb 2017 21:49:23 +0000
Subject: [PATCH] time mix instead of throttle with HIFI_AUDIO_MIXER_DEBUG

---
 assignment-client/src/audio/AudioMixer.cpp    |  4 ++--
 .../src/audio/AudioMixerSlave.cpp             | 21 +++++++++----------
 .../src/audio/AudioMixerStats.cpp             |  8 +++----
 assignment-client/src/audio/AudioMixerStats.h |  6 +++---
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 42c3e9812b..4885720ce4 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -315,8 +315,8 @@ void AudioMixer::sendStatsPacket() {
     addTiming(_mixTiming, "mix");
     addTiming(_eventsTiming, "events");
 
-#ifdef HIFI_AUDIO_THROTTLE_DEBUG
-    timingStats["ns_per_throttle"] = (_stats.totalMixes > 0) ?  (float)(_stats.throttleTime / _stats.totalMixes) : 0;
+#ifdef HIFI_AUDIO_MIXER_DEBUG
+    timingStats["ns_per_mix"] = (_stats.totalMixes > 0) ?  (float)(_stats.mixTime / _stats.totalMixes) : 0;
 #endif
 
     // call it "avg_..." to keep it higher in the display, sorted alphabetically
diff --git a/assignment-client/src/audio/AudioMixerSlave.cpp b/assignment-client/src/audio/AudioMixerSlave.cpp
index d41fe598cc..370df60ec5 100644
--- a/assignment-client/src/audio/AudioMixerSlave.cpp
+++ b/assignment-client/src/audio/AudioMixerSlave.cpp
@@ -133,6 +133,10 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& listener) {
         }
     };
 
+#ifdef HIFI_AUDIO_MIXER_DEBUG
+    auto mixStart = p_high_resolution_clock::now();
+#endif
+
     std::for_each(_begin, _end, [&](const SharedNodePointer& node) {
         AudioMixerClientData* nodeData = static_cast<AudioMixerClientData*>(node->getLinkedData());
         if (!nodeData) {
@@ -151,10 +155,6 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& listener) {
             if (!isThrottling) {
                 forAllStreams(node, nodeData, &AudioMixerSlave::mixStream);
             } else {
-#ifdef HIFI_AUDIO_THROTTLE_DEBUG
-                auto throttleStart = p_high_resolution_clock::now();
-#endif
-
                 auto nodeID = node->getUUID();
 
                 // compute the node's max relative volume
@@ -179,13 +179,6 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& listener) {
                 if (!throttledNodes.empty()) {
                     std::push_heap(throttledNodes.begin(), throttledNodes.end());
                 }
-
-#ifdef HIFI_AUDIO_THROTTLE_DEBUG
-                auto throttleEnd = p_high_resolution_clock::now();
-                uint64_t throttleTime =
-                    std::chrono::duration_cast<std::chrono::nanoseconds>(throttleEnd - throttleStart).count();
-                stats.throttleTime += throttleTime;
-#endif
             }
         }
     });
@@ -215,6 +208,12 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& listener) {
         }
     }
 
+#ifdef HIFI_AUDIO_MIXER_DEBUG
+    auto mixEnd = p_high_resolution_clock::now();
+    auto mixTime = std::chrono::duration_cast<std::chrono::nanoseconds>(mixEnd - mixStart);
+    stats.mixTime += mixTime.count();
+#endif
+
     // use the per listener AudioLimiter to render the mixed data...
     listenerData->audioLimiter.render(_mixSamples, _bufferSamples, AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL);
 
diff --git a/assignment-client/src/audio/AudioMixerStats.cpp b/assignment-client/src/audio/AudioMixerStats.cpp
index a3a3a215bc..a831210871 100644
--- a/assignment-client/src/audio/AudioMixerStats.cpp
+++ b/assignment-client/src/audio/AudioMixerStats.cpp
@@ -20,8 +20,8 @@ void AudioMixerStats::reset() {
     hrtfThrottleRenders = 0;
     manualStereoMixes = 0;
     manualEchoMixes = 0;
-#ifdef HIFI_AUDIO_THROTTLE_DEBUG
-    throttleTime = 0;
+#ifdef HIFI_AUDIO_MIXER_DEBUG
+    mixTime = 0;
 #endif
 }
 
@@ -34,7 +34,7 @@ void AudioMixerStats::accumulate(const AudioMixerStats& otherStats) {
     hrtfThrottleRenders += otherStats.hrtfThrottleRenders;
     manualStereoMixes += otherStats.manualStereoMixes;
     manualEchoMixes += otherStats.manualEchoMixes;
-#ifdef HIFI_AUDIO_THROTTLE_DEBUG
-    throttleTime += otherStats.throttleTime;
+#ifdef HIFI_AUDIO_MIXER_DEBUG
+    mixTime += otherStats.mixTime;
 #endif
 }
diff --git a/assignment-client/src/audio/AudioMixerStats.h b/assignment-client/src/audio/AudioMixerStats.h
index f7e3ed1525..77ac8b985d 100644
--- a/assignment-client/src/audio/AudioMixerStats.h
+++ b/assignment-client/src/audio/AudioMixerStats.h
@@ -12,7 +12,7 @@
 #ifndef hifi_AudioMixerStats_h
 #define hifi_AudioMixerStats_h
 
-#ifdef HIFI_AUDIO_THROTTLE_DEBUG
+#ifdef HIFI_AUDIO_MIXER_DEBUG
 #include <cstdint>
 #endif
 
@@ -29,8 +29,8 @@ struct AudioMixerStats {
     int manualStereoMixes { 0 };
     int manualEchoMixes { 0 };
 
-#ifdef HIFI_AUDIO_THROTTLE_DEBUG
-    uint64_t throttleTime { 0 };
+#ifdef HIFI_AUDIO_MIXER_DEBUG
+    uint64_t mixTime { 0 };
 #endif
 
     void reset();