diff options
author | Glenn Kasten <gkasten@google.com> | 2013-07-12 09:45:18 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2013-07-30 09:24:03 -0700 |
commit | f20e1d8df84c5fbeeace0052d100982ae39bb7a4 (patch) | |
tree | 997cd41de1adb829c194f56cf29eb02945666b94 /services/audioflinger | |
parent | eced2daaa6c91a3731eef978ce65c6ec319c5e6a (diff) | |
download | frameworks_av-f20e1d8df84c5fbeeace0052d100982ae39bb7a4.zip frameworks_av-f20e1d8df84c5fbeeace0052d100982ae39bb7a4.tar.gz frameworks_av-f20e1d8df84c5fbeeace0052d100982ae39bb7a4.tar.bz2 |
Rename control block server to mServer and add comments
Change-Id: Ieabd91acee92d0e84e66fbd358df5282b856306e
Diffstat (limited to 'services/audioflinger')
-rw-r--r-- | services/audioflinger/Threads.cpp | 15 | ||||
-rw-r--r-- | services/audioflinger/Tracks.cpp | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 62e2e1e..2bb6495 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -2903,7 +2903,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac if ((framesReady >= minFrames) && track->isReady() && !track->isPaused() && !track->isTerminated()) { - ALOGVV("track %d s=%08x [OK] on thread %p", name, cblk->server, this); + ALOGVV("track %d s=%08x [OK] on thread %p", name, cblk->mServer, this); mixedTracks++; @@ -2932,7 +2932,8 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac param = AudioMixer::RAMP_VOLUME; } mAudioMixer->setParameter(name, AudioMixer::RESAMPLE, AudioMixer::RESET, NULL); - } else if (cblk->server != 0) { + // FIXME should not make a decision based on mServer + } else if (cblk->mServer != 0) { // If the track is stopped before the first frame was mixed, // do not apply ramp param = AudioMixer::RAMP_VOLUME; @@ -3069,7 +3070,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac chain->clearInputBuffer(); } - ALOGVV("track %d s=%08x [NOT READY] on thread %p", name, cblk->server, this); + ALOGVV("track %d s=%08x [NOT READY] on thread %p", name, cblk->mServer, this); if ((track->sharedBuffer() != 0) || track->isTerminated() || track->isStopped() || track->isPaused()) { // We have consumed all the buffers of this track. @@ -3483,7 +3484,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::DirectOutputThread::prep if ((track->framesReady() >= minFrames) && track->isReady() && !track->isPaused() && !track->isTerminated()) { - ALOGVV("track %d u=%08x, s=%08x [OK]", track->name(), cblk->user, cblk->server); + ALOGVV("track %d s=%08x [OK]", track->name(), cblk->mServer); if (track->mFillingUpStatus == Track::FS_FILLED) { track->mFillingUpStatus = Track::FS_ACTIVE; @@ -3508,7 +3509,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::DirectOutputThread::prep mEffectChains[0]->clearInputBuffer(); } - ALOGVV("track %d u=%08x, s=%08x [NOT READY]", track->name(), cblk->user, cblk->server); + ALOGVV("track %d s=%08x [NOT READY]", track->name(), cblk->mServer); if ((track->sharedBuffer() != 0) || track->isTerminated() || track->isStopped() || track->isPaused()) { // We have consumed all the buffers of this track. @@ -3847,7 +3848,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::OffloadThread::prepareTr tracksToRemove->add(track); } else if (track->framesReady() && track->isReady() && !track->isPaused() && !track->isTerminated()) { - ALOGVV("OffloadThread: track %d s=%08x [OK]", track->name(), cblk->server); + ALOGVV("OffloadThread: track %d s=%08x [OK]", track->name(), cblk->mServer); if (track->mFillingUpStatus == Track::FS_FILLED) { track->mFillingUpStatus = Track::FS_ACTIVE; mLeftVolFloat = mRightVolFloat = 0; @@ -3875,7 +3876,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::OffloadThread::prepareTr mixerStatus = MIXER_TRACKS_READY; } } else { - ALOGVV("OffloadThread: track %d s=%08x [NOT READY]", track->name(), cblk->server); + ALOGVV("OffloadThread: track %d s=%08x [NOT READY]", track->name(), cblk->mServer); if (track->isStopping_1()) { // Hardware buffer can hold a large amount of audio so we must // wait for all current track's data to drain before we say diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index 3e184b4..4f2e372 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -468,7 +468,7 @@ void AudioFlinger::PlaybackThread::Track::dump(char* buffer, size_t size) mAudioTrackServerProxy->getSampleRate(), 20.0 * log10((vlr & 0xFFFF) / 4096.0), 20.0 * log10((vlr >> 16) / 4096.0), - mCblk->server, + mCblk->mServer, (int)mMainBuffer, (int)mAuxBuffer, mCblk->flags, @@ -1739,7 +1739,7 @@ void AudioFlinger::RecordThread::RecordTrack::dump(char* buffer, size_t size) mChannelMask, mSessionId, mState, - mCblk->server, + mCblk->mServer, mFrameCount); } |