diff options
author | Glenn Kasten <gkasten@google.com> | 2015-03-20 08:59:18 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2015-03-23 08:02:50 -0700 |
commit | d2027336b45f524a196403d351ec317782793792 (patch) | |
tree | 88b2d938d53d20c4caa1cd82a69d52dbcdbdaefd | |
parent | 6991ed25d8b5c2f75325ccd7cc522762da6f2b09 (diff) | |
download | frameworks_av-d2027336b45f524a196403d351ec317782793792.zip frameworks_av-d2027336b45f524a196403d351ec317782793792.tar.gz frameworks_av-d2027336b45f524a196403d351ec317782793792.tar.bz2 |
Whitespace
Change-Id: I4640be948ad3caff0eb7525991398a1353e4bfe6
-rw-r--r-- | include/media/AudioRecord.h | 8 | ||||
-rw-r--r-- | include/media/AudioTrack.h | 2 | ||||
-rw-r--r-- | media/libmedia/IMediaHTTPConnection.cpp | 3 | ||||
-rw-r--r-- | media/libmedia/IMediaHTTPService.cpp | 3 |
4 files changed, 7 insertions, 9 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, diff --git a/media/libmedia/IMediaHTTPConnection.cpp b/media/libmedia/IMediaHTTPConnection.cpp index 7e26ee6..2ff7658 100644 --- a/media/libmedia/IMediaHTTPConnection.cpp +++ b/media/libmedia/IMediaHTTPConnection.cpp @@ -178,5 +178,4 @@ private: IMPLEMENT_META_INTERFACE( MediaHTTPConnection, "android.media.IMediaHTTPConnection"); -} // namespace android - +} // namespace android diff --git a/media/libmedia/IMediaHTTPService.cpp b/media/libmedia/IMediaHTTPService.cpp index 1260582..f30d0f3 100644 --- a/media/libmedia/IMediaHTTPService.cpp +++ b/media/libmedia/IMediaHTTPService.cpp @@ -54,5 +54,4 @@ struct BpMediaHTTPService : public BpInterface<IMediaHTTPService> { IMPLEMENT_META_INTERFACE( MediaHTTPService, "android.media.IMediaHTTPService"); -} // namespace android - +} // namespace android |