commit d258c58cc024c57e863b96db930e4d225dededbe
author The Android Automerger <android-build@google.com> Mon May 02 15:20:38 2016 -0700
committer The Android Automerger <android-build@google.com> Mon May 02 15:20:38 2016 -0700
tree 5706a4f02b78005f2f64b17d7084562f92d2220e
parent 805e9b9aed2ff28795ea090bebdcd649a70571c3
parent 7650b1596a46e00a0f40783711a15dc0d4eccf24

merge in nyc-release history after reset to nyc-dev

src/android/AudioPlayer_to_android.cpp

diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
index 05fc5dd..f8ea870 100644
--- a/src/android/AudioPlayer_to_android.cpp
+++ b/src/android/AudioPlayer_to_android.cpp
@@ -1495,10 +1495,6 @@
             policy = AUDIO_OUTPUT_FLAG_NONE;
         }
 
-        // negative notificationFrames is the number of notifications (sub-buffers) per track buffer
-        // for details see the explanation at frameworks/av/include/media/AudioTrack.h
-        const int32_t notificationFrames = -pAudioPlayer->mBufferQueue.mNumBuffers;
-
         pAudioPlayer->mAudioTrack = new android::AudioTrack(
                 pAudioPlayer->mStreamType,                           // streamType
                 sampleRate,                                          // sampleRate
@@ -1508,7 +1504,7 @@
                 policy,                                              // flags
                 audioTrack_callBack_pullFromBuffQueue,               // callback
                 (void *) pAudioPlayer,                               // user
-                notificationFrames,                                  // see comment above
+                0,     // FIXME find appropriate frame count         // notificationFrame
                 pAudioPlayer->mSessionId);
         android::status_t status = pAudioPlayer->mAudioTrack->initCheck();
         if (status != android::NO_ERROR) {