diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioTrack.h | 3 | ||||
| -rw-r--r-- | include/private/media/AudioTrackShared.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 5f235cb..6e88032 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -509,7 +509,7 @@ protected: float mSendLevel; uint32_t mFrameCount; - audio_track_cblk_t* mCblk; + audio_track_cblk_t* mCblk; // re-load after mLock.unlock() audio_format_t mFormat; audio_stream_type_t mStreamType; uint8_t mChannelCount; @@ -548,7 +548,6 @@ protected: // It is OK to lock only mCblk->lock. mutable Mutex mLock; - status_t mRestoreStatus; bool mIsTimed; int mPreviousPriority; // before start() SchedPolicy mPreviousSchedulingGroup; diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h index 46788c4..90301cd 100644 --- a/include/private/media/AudioTrackShared.h +++ b/include/private/media/AudioTrackShared.h @@ -31,6 +31,7 @@ namespace android { // init time #define MAX_RUN_TIMEOUT_MS 1000 #define WAIT_PERIOD_MS 10 +// AudioTrack no longer uses this, it is for AudioRecord only: #define RESTORE_TIMEOUT_MS 5000 // Maximum waiting time for a track to be restored #define CBLK_UNDERRUN 0x01 // set: underrun (out) or overrrun (in), clear: no underrun or overrun @@ -38,6 +39,7 @@ namespace android { // clear: track is ready when buffer full #define CBLK_INVALID 0x04 // track buffer invalidated by AudioFlinger, need to re-create #define CBLK_DISABLED 0x08 // track disabled by AudioFlinger due to underrun, need to re-start +// AudioTrack no longer uses these, they are for AudioRecord only: #define CBLK_RESTORING 0x10 // track is being restored after invalidation by AudioFlinger #define CBLK_RESTORED 0x20 // track has been restored after invalidation by AudioFlinger |