diff options
author | Glenn Kasten <gkasten@google.com> | 2012-11-14 16:14:31 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-14 16:14:32 -0800 |
commit | 1513ad2d2de0962cc3b3121e6fae73d8ee1a4639 (patch) | |
tree | 4baf59541c549bfc5b0367f1477dec1021954a35 /services/audioflinger | |
parent | 8f1c74943c454fec3f1adf87312c4a4c89829d90 (diff) | |
parent | 020f79fd967736d36c7ec860814e2e93866a020f (diff) | |
download | frameworks_av-1513ad2d2de0962cc3b3121e6fae73d8ee1a4639.zip frameworks_av-1513ad2d2de0962cc3b3121e6fae73d8ee1a4639.tar.gz frameworks_av-1513ad2d2de0962cc3b3121e6fae73d8ee1a4639.tar.bz2 |
Merge "Update audio comments"
Diffstat (limited to 'services/audioflinger')
-rw-r--r-- | services/audioflinger/AudioFlinger.h | 6 | ||||
-rw-r--r-- | services/audioflinger/StateQueue.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 8cf58b1..54cf239 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -861,6 +861,9 @@ private: sp<IMemory> sharedBuffer() const { return mSharedBuffer; } + // framesWritten is cumulative, never reset, and is shared all tracks + // audioHalFrames is derived from output latency + // FIXME parameters not needed, could get them from the thread bool presentationComplete(size_t framesWritten, size_t audioHalFrames); public: @@ -893,6 +896,7 @@ private: bool mHasVolumeController; size_t mPresentationCompleteFrames; // number of frames written to the // audio HAL when this track will be fully rendered + // zero means not monitoring private: IAudioFlinger::track_flags_t mFlags; @@ -997,7 +1001,7 @@ private: }; - // playback track + // playback track, used by DuplicatingThread class OutputTrack : public Track { public: diff --git a/services/audioflinger/StateQueue.h b/services/audioflinger/StateQueue.h index c9b5111..e33b3c6 100644 --- a/services/audioflinger/StateQueue.h +++ b/services/audioflinger/StateQueue.h @@ -174,7 +174,7 @@ public: #endif private: - static const unsigned kN = 4; // values != 4 are not supported by this code + static const unsigned kN = 4; // values < 4 are not supported by this code T mStates[kN]; // written by mutator, read by observer // "volatile" is meaningless with SMP, but here it indicates that we're using atomic ops |