diff options
author | Glenn Kasten <gkasten@google.com> | 2012-06-14 08:41:38 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-14 08:41:38 -0700 |
commit | 49dd5cf3469cd755321f8ec10013ad4fcfaf723d (patch) | |
tree | 2f849ff8d42627300eb0cd221e3bc04716db889e /services | |
parent | e20435de10f63af812da9d4f801b61a8817733a0 (diff) | |
parent | 0c9d26d187017f7fb028ab52a0fbc6395142faa4 (diff) |
Merge "Log track name on obtain/releaseBuffer warnings" into jb-dev
Diffstat (limited to 'services')
-rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 586a916e..900f74c1 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -4287,6 +4287,7 @@ AudioFlinger::PlaybackThread::Track::Track( mCblk->frameSize = audio_is_linear_pcm(format) ? mChannelCount * sizeof(int16_t) : sizeof(uint8_t); // to avoid leaking a track name, do not allocate one unless there is an mCblk mName = thread->getTrackName_l((audio_channel_mask_t)channelMask); + mCblk->mName = mName; if (mName < 0) { ALOGE("no more track names available"); return; @@ -4302,6 +4303,7 @@ AudioFlinger::PlaybackThread::Track::Track( // this means we are potentially denying other more important fast tracks from // being created. It would be better to allocate the index dynamically. mFastIndex = i; + mCblk->mName = i; // Read the initial underruns because this field is never cleared by the fast mixer mObservedUnderruns = thread->getFastTrackUnderruns(i); thread->mFastTrackAvailMask &= ~(1 << i); |