commit c06f0ef67f02f88e01e2b2679e83c87628dbfc1a
author Eric Laurent <elaurent@google.com> Fri Sep 11 03:49:54 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 11 03:49:54 2015 +0000
tree ab5e58f6145f75e9a823057f4001fd9209901831
parent 74adefb32f6694d45416d11b5c3000b404e94506
parent b7b97b9d897581b30f4bba78ec360474646c230a

am b7b97b9d: am 48e879db: am a2ab4505: audio flinger: force audio path start from normal mixer

* commit 'b7b97b9d897581b30f4bba78ec360474646c230a':
  audio flinger: force audio path start from normal mixer

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 0f89c16..151f662 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -3479,6 +3479,12 @@
         if (state->mCommand != FastMixerState::MIX_WRITE &&
                 (kUseFastMixer != FastMixer_Dynamic || state->mTrackMask > 1)) {
             if (state->mCommand == FastMixerState::COLD_IDLE) {
+
+                // FIXME workaround for first HAL write being CPU bound on some devices
+                ATRACE_BEGIN("write");
+                mOutput->write((char *)mSinkBuffer, 0);
+                ATRACE_END();
+
                 int32_t old = android_atomic_inc(&mFastMixerFutex);
                 if (old == -1) {
                     (void) syscall(__NR_futex, &mFastMixerFutex, FUTEX_WAKE_PRIVATE, 1);