From 5918c492cc923956e2091a29199b232646a2b3c2 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 18 Jun 2013 10:46:45 -0700 Subject: [PATCH 1/2] correct stat collection for mixer frame time usage --- audio-mixer/src/main.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp index 6606e97c9c..2ad86f6970 100644 --- a/audio-mixer/src/main.cpp +++ b/audio-mixer/src/main.cpp @@ -412,6 +412,9 @@ int main(int argc, const char* argv[]) { if (percentageOfMaxElapsed > 0) { sumFrameTimePercentages += percentageOfMaxElapsed; + } else { + // a negative value suggests that we've taken 100% of the allowable time + sumFrameTimePercentages += 100; } numStatCollections++; From b51d3e88d3acfbabf3b8f9a9aebe18366a2b55d4 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 18 Jun 2013 10:49:15 -0700 Subject: [PATCH 2/2] impossible for percentageOfMaxElapsed to be zero --- audio-mixer/src/main.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp index 2ad86f6970..c19aba0a9c 100644 --- a/audio-mixer/src/main.cpp +++ b/audio-mixer/src/main.cpp @@ -410,12 +410,7 @@ int main(int argc, const char* argv[]) { float percentageOfMaxElapsed = ((float) (usecTimestamp(&endSendTime) - usecTimestamp(&beginSendTime)) / BUFFER_SEND_INTERVAL_USECS) * 100.0f; - if (percentageOfMaxElapsed > 0) { - sumFrameTimePercentages += percentageOfMaxElapsed; - } else { - // a negative value suggests that we've taken 100% of the allowable time - sumFrameTimePercentages += 100; - } + sumFrameTimePercentages += percentageOfMaxElapsed; numStatCollections++; }