diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-03-23 15:56:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-23 15:56:20 +0000 |
| commit | e063c308aaeaf85c9c41fda5df083a8aa90bdb24 (patch) | |
| tree | f4ec5b1176ca063f48644f4abe1c86eb9e7327e9 /include | |
| parent | 0fe431544e5320a58508fb0533063d36dad1a473 (diff) | |
| parent | d2027336b45f524a196403d351ec317782793792 (diff) | |
| download | frameworks_av-e063c308aaeaf85c9c41fda5df083a8aa90bdb24.zip frameworks_av-e063c308aaeaf85c9c41fda5df083a8aa90bdb24.tar.gz frameworks_av-e063c308aaeaf85c9c41fda5df083a8aa90bdb24.tar.bz2 | |
Merge "Whitespace"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioRecord.h | 8 | ||||
| -rw-r--r-- | include/media/AudioTrack.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index 87fca89..52d798e 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -470,7 +470,7 @@ private: bool mActive; // for client callback handler - callback_t mCbf; // callback handler for events, or NULL + callback_t mCbf; // callback handler for events, or NULL void* mUserData; // for notification APIs @@ -487,10 +487,10 @@ private: bool mRetryOnPartialBuffer; // sleep and retry after partial obtainBuffer() uint32_t mObservedSequence; // last observed value of mSequence - uint32_t mMarkerPosition; // in wrapping (overflow) frame units + uint32_t mMarkerPosition; // in wrapping (overflow) frame units bool mMarkerReached; - uint32_t mNewPosition; // in frames - uint32_t mUpdatePeriod; // in frames, zero means no EVENT_NEW_POS + uint32_t mNewPosition; // in frames + uint32_t mUpdatePeriod; // in frames, zero means no EVENT_NEW_POS status_t mStatus; diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 0d10e31..b5a3a9a 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -560,7 +560,6 @@ public: * frameCount currently ignored but recommend to set to actual number of frames filled * size actual number of bytes filled, must be multiple of frameSize * raw ignored - * */ // FIXME make private when obtainBuffer() for TRANSFER_OBTAIN is removed void releaseBuffer(const Buffer* audioBuffer); @@ -774,6 +773,7 @@ protected: bool mMarkerReached; uint32_t mNewPosition; // in frames uint32_t mUpdatePeriod; // in frames, zero means no EVENT_NEW_POS + uint32_t mServer; // in frames, last known mProxy->getPosition() // which is count of frames consumed by server, // reset by new IAudioTrack, |