summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioFlinger.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-11-13 12:25:44 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-11-13 12:25:44 -0800
commit2d81f665461409f0c5d0be674a35a0aea63a4fc8 (patch)
tree9a3a7d006bfdba1e83b4d98ef408dd8dcb4e4501 /services/audioflinger/AudioFlinger.h
parentb36a7a68af073b1e7fd5cad6aa2c52223fd30efd (diff)
parent9f2016d9adfb4f88fa0bbfcfa5954f79160db595 (diff)
downloadframeworks_av-2d81f665461409f0c5d0be674a35a0aea63a4fc8.zip
frameworks_av-2d81f665461409f0c5d0be674a35a0aea63a4fc8.tar.gz
frameworks_av-2d81f665461409f0c5d0be674a35a0aea63a4fc8.tar.bz2
Merge "Rename TrackBase::mFrameCount to mStepCount"
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
-rw-r--r--services/audioflinger/AudioFlinger.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index 38744d0..8cf58b1 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -453,7 +453,7 @@ private:
return mState == TERMINATED;
}
- bool step();
+ bool step(); // mStepCount is an implicit input
void reset();
virtual bool isOut() const = 0; // true for Track and TimedTrack, false for RecordTrack,
@@ -466,7 +466,8 @@ private:
void* mBuffer; // start of track buffer, typically in shared memory
void* mBufferEnd; // &mBuffer[mFrameCount * frameSize], where frameSize
// is based on mChannelCount and 16-bit samples
- uint32_t mFrameCount;
+ uint32_t mStepCount; // saves AudioBufferProvider::Buffer::frameCount as of
+ // time of releaseBuffer() for later use by step()
// we don't really need a lock for these
track_state mState;
const uint32_t mSampleRate; // initial sample rate only; for tracks which