diff options
author | Glenn Kasten <gkasten@google.com> | 2013-02-12 20:43:58 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-12 20:43:58 +0000 |
commit | ecd9389c8712aedeb2a79823ea0e4fb842684269 (patch) | |
tree | 32635746bbb3c6f4b4297754d0d388fae41c6574 /services/audioflinger/Threads.cpp | |
parent | 3051df27261e9952c0e642dec548515250e85f6a (diff) | |
download | frameworks_av-ecd9389c8712aedeb2a79823ea0e4fb842684269.zip frameworks_av-ecd9389c8712aedeb2a79823ea0e4fb842684269.tar.gz frameworks_av-ecd9389c8712aedeb2a79823ea0e4fb842684269.tar.bz2 |
Revert "Temporary additional logging to investigate bug"
This reverts commit 3051df27261e9952c0e642dec548515250e85f6a
Change-Id: I8bf5c3e91b65bd20de26f480c367c2854b62373c
Diffstat (limited to 'services/audioflinger/Threads.cpp')
-rw-r--r-- | services/audioflinger/Threads.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 8cc5f6c..ba848d7 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -1196,8 +1196,6 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac { // scope for mLock Mutex::Autolock _l(mLock); - mNBLogWriter->logf("createTrack_l isFast=%d caller=%d", - (*flags & IAudioFlinger::TRACK_FAST) != 0, IPCThreadState::self()->getCallingPid()); // all tracks in same audio session must share the same routing strategy otherwise // conflicts will happen when tracks are moved from one output to another by audio policy @@ -1251,6 +1249,7 @@ Exit: if (status) { *status = lStatus; } + mNBLogWriter->logf("createTrack_l"); return track; } @@ -1318,8 +1317,7 @@ float AudioFlinger::PlaybackThread::streamVolume(audio_stream_type_t stream) con // addTrack_l() must be called with ThreadBase::mLock held status_t AudioFlinger::PlaybackThread::addTrack_l(const sp<Track>& track) { - mNBLogWriter->logf("addTrack_l mName=%d mFastIndex=%d caller=%d", track->mName, - track->mFastIndex, IPCThreadState::self()->getCallingPid()); + mNBLogWriter->logf("addTrack_l mName=%d", track->mName); status_t status = ALREADY_EXISTS; // set retry count for buffer fill @@ -1353,9 +1351,7 @@ status_t AudioFlinger::PlaybackThread::addTrack_l(const sp<Track>& track) // destroyTrack_l() must be called with ThreadBase::mLock held void AudioFlinger::PlaybackThread::destroyTrack_l(const sp<Track>& track) { - mNBLogWriter->logTimestamp(); - mNBLogWriter->logf("destroyTrack_l mName=%d mFastIndex=%d mClientPid=%d", track->mName, - track->mFastIndex, track->mClient != 0 ? track->mClient->pid() : -1); + mNBLogWriter->logf("destroyTrack_l mName=%d", track->mName); track->mState = TrackBase::TERMINATED; // active tracks are removed by threadLoop() if (mActiveTracks.indexOf(track) < 0) { @@ -1365,9 +1361,7 @@ void AudioFlinger::PlaybackThread::destroyTrack_l(const sp<Track>& track) void AudioFlinger::PlaybackThread::removeTrack_l(const sp<Track>& track) { - mNBLogWriter->logTimestamp(); - mNBLogWriter->logf("removeTrack_l mName=%d mFastIndex=%d clientPid=%d", track->mName, - track->mFastIndex, track->mClient != 0 ? track->mClient->pid() : -1); + mNBLogWriter->logf("removeTrack_l mName=%d", track->mName); track->triggerEvents(AudioSystem::SYNC_EVENT_PRESENTATION_COMPLETE); mTracks.remove(track); deleteTrackName_l(track->name()); @@ -2876,9 +2870,7 @@ track_is_ready: ; if (CC_UNLIKELY(count)) { for (size_t i=0 ; i<count ; i++) { const sp<Track>& track = tracksToRemove->itemAt(i); - mNBLogWriter->logTimestamp(); - mNBLogWriter->logf("prepareTracks_l remove name=%u mFastIndex=%d", track->name(), - track->mFastIndex); + mNBLogWriter->logf("prepareTracks_l remove name=%u", track->name()); mActiveTracks.remove(track); if (track->mainBuffer() != mMixBuffer) { chain = getEffectChain_l(track->sessionId()); |