diff options
author | Glenn Kasten <gkasten@google.com> | 2012-03-21 07:24:21 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-21 07:24:21 -0700 |
commit | 63c1faa8dea7feb90255d31ef2a133d8f2818844 (patch) | |
tree | 973c66b51e7e85b6ea753b5643f7d99c66d82dde /services | |
parent | 7153494670bdac8b650cb10b8b1838651e0ca418 (diff) | |
parent | 17a736c3e1d062d7fc916329eb32aef8935614af (diff) | |
download | frameworks_av-63c1faa8dea7feb90255d31ef2a133d8f2818844.zip frameworks_av-63c1faa8dea7feb90255d31ef2a133d8f2818844.tar.gz frameworks_av-63c1faa8dea7feb90255d31ef2a133d8f2818844.tar.bz2 |
Merge "Update comments"
Diffstat (limited to 'services')
-rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 2 | ||||
-rw-r--r-- | services/audioflinger/AudioFlinger.h | 6 | ||||
-rw-r--r-- | services/audioflinger/AudioMixer.cpp | 4 | ||||
-rw-r--r-- | services/audioflinger/AudioMixer.h | 5 |
4 files changed, 14 insertions, 3 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 1dd9a38..3ab4e34 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -4256,7 +4256,7 @@ void AudioFlinger::RecordThread::RecordTrack::stop() RecordThread *recordThread = (RecordThread *)thread.get(); recordThread->stop(this); TrackBase::reset(); - // Force overerrun condition to avoid false overrun callback until first data is + // Force overrun condition to avoid false overrun callback until first data is // read from buffer android_atomic_or(CBLK_UNDERRUN_ON, &mCblk->flags); } diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 0e4b24a..7a57613 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -899,6 +899,7 @@ public: protected: SortedVector< wp<Track> > mActiveTracks; + // Allocate a track name. Returns name >= 0 if successful, -1 on failure. virtual int getTrackName_l() = 0; virtual void deleteTrackName_l(int name) = 0; virtual uint32_t activeSleepTimeUs(); @@ -1559,9 +1560,10 @@ mutable Mutex mLock; // mutex for process, commands and handl uint32_t mNewLeftVolume; // new volume on left channel uint32_t mNewRightVolume; // new volume on right channel uint32_t mStrategy; // strategy for this effect chain - // mSuspendedEffects lists all effect currently suspended in the chain - // use effect type UUID timelow field as key. There is no real risk of identical + // mSuspendedEffects lists all effects currently suspended in the chain. + // Use effect type UUID timelow field as key. There is no real risk of identical // timeLow fields among effect type UUIDs. + // Updated by updateSuspendedSessions_l() only. KeyedVector< int, sp<SuspendedEffectDesc> > mSuspendedEffects; }; diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 6e761ba..98852fd 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -57,6 +57,10 @@ AudioMixer::AudioMixer(size_t frameCount, uint32_t sampleRate) mState.outputTemp = NULL; mState.resampleTemp = NULL; // mState.reserved + + // FIXME Most of the following initialization is probably redundant since + // tracks[i] should only be referenced if (mTrackNames & (1 << i)) != 0 + // and mTrackNames is initially 0. However, leave it here until that's verified. track_t* t = mState.tracks; for (unsigned i=0 ; i < MAX_NUM_TRACKS ; i++) { t->needs = 0; diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index b210212..ab80a9a 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -70,9 +70,14 @@ public: // For all APIs with "name": TRACK0 <= name < TRACK0 + MAX_NUM_TRACKS + + // Allocate a track name. Returns new track name if successful, -1 on failure. int getTrackName(); + + // Free an allocated track by name void deleteTrackName(int name); + // Enable or disable an allocated track by name void enable(int name); void disable(int name); |