Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup DirectOutputThread::mActiveTrack

Browse Source 
Rename activeTrack to mActiveTrack.
Release the reference earlier, at the end of threadLoop_mix().
This allows the field to be made private and to
  move the declaration from PlaybackThread to DirectOutputThread.

Change-Id: I02be7a254638f7d85e92aaf0002d20ca0092a5c3
This commit is contained in:
Glenn Kasten
2012-03-07 17:05:59 -08:00
parent 7ef9743597
commit b8f96760dc
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/audioflinger/AudioFlinger.cpp
View File

@@ -2043,10 +2043,6 @@ if (mType == MIXER) {
processConfigEvents();
if (mType == DIRECT) {
activeTrack.clear();
}
mixerStatus = MIXER_IDLE;
{ // scope for mLock
@@ -2138,10 +2134,6 @@ if (mType == MIXER) {
lockEffectChains_l(effectChains);
}
if (mType == DIRECT) {
// For DirectOutputThread, this test is equivalent to "activeTrack != 0"
}
if (CC_LIKELY(mixerStatus == MIXER_TRACKS_READY)) {
threadLoop_mix();
} else {
@@ -2196,10 +2188,6 @@ if (mType == MIXER) {
// same lock.
tracksToRemove.clear();
// FIXME merge these
if (mType == DIRECT) {
activeTrack.clear();
}
// FIXME I don't understand the need for this here;
// it was in the original code but maybe the
// assignment in saveOutputTracks() makes this unnecessary?
@@ -2918,7 +2906,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::DirectOutputThread::prep
// reset retry count
track->mRetryCount = kMaxTrackRetriesDirect;
activeTrack = t;
mActiveTrack = t;
mixerStatus_ = MIXER_TRACKS_READY;
} else {
//ALOGV("track %d u=%08x, s=%08x [NOT READY]", track->name(), cblk->user, cblk->server);
@@ -2968,7 +2956,7 @@ void AudioFlinger::DirectOutputThread::threadLoop_mix()
// output audio to hardware
while (frameCount) {
buffer.frameCount = frameCount;
activeTrack->getNextBuffer(&buffer);
mActiveTrack->getNextBuffer(&buffer);
if (CC_UNLIKELY(buffer.raw == NULL)) {
memset(curBuf, 0, frameCount * mFrameSize);
break;
@@ -2976,10 +2964,11 @@ void AudioFlinger::DirectOutputThread::threadLoop_mix()
memcpy(curBuf, buffer.raw, buffer.frameCount * mFrameSize);
frameCount -= buffer.frameCount;
curBuf += buffer.frameCount * mFrameSize;
activeTrack->releaseBuffer(&buffer);
mActiveTrack->releaseBuffer(&buffer);
}
sleepTime = 0;
standbyTime = systemTime() + standbyDelay;
mActiveTrack.clear();
applyVolume();
}

5
services/audioflinger/AudioFlinger.h
View File

@@ -973,8 +973,6 @@ public:
mixer_state mPrevMixerStatus; // previous status returned by prepareTracks_l()
// DIRECT only
nsecs_t standbyDelay;
// activeTrack was local to the while !exitingPending loop
sp<Track> activeTrack;
// DUPLICATING only
uint32_t writeFrames;
};
@@ -1046,6 +1044,9 @@ public:
private:
void applyVolume(); // FIXME inline into threadLoop_mix()
// prepareTracks_l() tells threadLoop_mix() the name of the single active track
sp<Track> mActiveTrack;
};
class DuplicatingThread : public MixerThread {