From dafbf480e840affde63d45b6bb7377d4ac5907a5 Mon Sep 17 00:00:00 2001
From: Casey Langen <casey.langen@gmail.com>
Date: Sun, 15 Jan 2017 11:54:58 -0800
Subject: [PATCH] Reduce CPU usage in CoreAudioOut:

* We don't need to count buffers by provider, counting all buffers is good enough
* Use an std::deque instead of std::list to maintain pending buffers
* Removed boost, use std instead.
---
 src/contrib/coreaudioout/CoreAudioOut.cpp | 31 ++++++-----------------
 src/contrib/coreaudioout/CoreAudioOut.h   | 11 +++-----
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/src/contrib/coreaudioout/CoreAudioOut.cpp b/src/contrib/coreaudioout/CoreAudioOut.cpp
index 4bc104c10..149b88310 100644
--- a/src/contrib/coreaudioout/CoreAudioOut.cpp
+++ b/src/contrib/coreaudioout/CoreAudioOut.cpp
@@ -53,24 +53,9 @@ void audioCallback(void *customData, AudioQueueRef queue, AudioQueueBufferRef bu
     output->NotifyBufferCompleted(context);
 }
 
-size_t countBuffersWithProvider(
-    const std::list<CoreAudioOut::BufferContext*>& buffers,
-    const IBufferProvider* provider)
-{
-    size_t count = 0;
-    auto it = buffers.begin();
-    while (it != buffers.end()) {
-        if ((*it)->provider == provider) {
-            ++count;
-        }
-        ++it;
-    }
-    return count;
-}
-
 void CoreAudioOut::NotifyBufferCompleted(BufferContext *context) {
     {
-        boost::recursive_mutex::scoped_lock lock(this->mutex);
+        std::unique_lock<std::recursive_mutex> lock(this->mutex);
 
         bool found = false;
         auto it = this->buffers.begin();
@@ -112,13 +97,13 @@ CoreAudioOut::CoreAudioOut() {
 }
 
 int CoreAudioOut::Play(IBuffer *buffer, IBufferProvider *provider) {
-    boost::recursive_mutex::scoped_lock lock(this->mutex);
+    std::unique_lock<std::recursive_mutex> lock(this->mutex);
 
     if (this->state != StatePlaying) {
         return OutputInvalidState;
     }
 
-    if (countBuffersWithProvider(this->buffers, provider) >= BUFFER_COUNT) {
+    if (this->buffers.size() >= BUFFER_COUNT) {
         /* enough buffers are already in the queue. bail, we'll notify the
         caller when there's more data available */
         return OutputBufferFull;
@@ -209,7 +194,7 @@ void CoreAudioOut::Destroy() {
 }
 
 void CoreAudioOut::Drain() {
-    boost::recursive_mutex::scoped_lock lock(this->mutex);
+    std::unique_lock<std::recursive_mutex> lock(this->mutex);
 
     if (this->state != StateStopped && this->audioQueue) {
         std::cerr << "CoreAudioOut: draining...\n";
@@ -219,7 +204,7 @@ void CoreAudioOut::Drain() {
 }
 
 void CoreAudioOut::Pause() {
-    boost::recursive_mutex::scoped_lock lock(this->mutex);
+    std::unique_lock<std::recursive_mutex> lock(this->mutex);
 
     if (this->audioQueue) {
         AudioQueuePause(this->audioQueue);
@@ -228,7 +213,7 @@ void CoreAudioOut::Pause() {
 }
 
 void CoreAudioOut::Resume() {
-    boost::recursive_mutex::scoped_lock lock(this->mutex);
+    std::unique_lock<std::recursive_mutex> lock(this->mutex);
 
     if (this->audioQueue) {
         AudioQueueStart(this->audioQueue, nullptr);
@@ -238,7 +223,7 @@ void CoreAudioOut::Resume() {
 }
 
 void CoreAudioOut::SetVolume(double volume) {
-    boost::recursive_mutex::scoped_lock lock(this->mutex);
+    std::unique_lock<std::recursive_mutex> lock(this->mutex);
 
     this->volume = volume;
 
@@ -265,7 +250,7 @@ void CoreAudioOut::Stop() {
         /* AudioQueueStop/AudioQueueDispose will trigger the callback, which
         will try to dispose of the samples on a separate thread and deadlock.
         cache the queue and reset outside of the critical section */
-        boost::recursive_mutex::scoped_lock lock(this->mutex);
+        std::unique_lock<std::recursive_mutex> lock(this->mutex);
         queue = this->audioQueue;
         this->audioQueue = nullptr;
         this->state = StateStopped;
diff --git a/src/contrib/coreaudioout/CoreAudioOut.h b/src/contrib/coreaudioout/CoreAudioOut.h
index 066b41360..1883cb340 100644
--- a/src/contrib/coreaudioout/CoreAudioOut.h
+++ b/src/contrib/coreaudioout/CoreAudioOut.h
@@ -36,10 +36,8 @@
 
 #include <core/sdk/IOutput.h>
 #include <core/sdk/IBufferProvider.h>
-#include <queue>
-#include <boost/thread.hpp>
-#include <boost/thread/condition.hpp>
-#include <boost/thread/recursive_mutex.hpp>
+#include <deque>
+#include <mutex>
 #include <AudioToolbox/AudioQueue.h>
 #include <CoreAudio/CoreAudioTypes.h>
 #include <CoreFoundation/CFRunLoop.h>
@@ -83,9 +81,8 @@ class CoreAudioOut : public musik::core::sdk::IOutput {
         AudioStreamBasicDescription audioFormat;
         AudioQueueRef audioQueue;
         double volume;
-        std::list<BufferContext*> buffers;
-        boost::thread thread;
-        boost::recursive_mutex mutex;
+        std::deque<BufferContext*> buffers;
+        std::recursive_mutex mutex;
         bool quit;
         State state;
 };