From b36a7a68af073b1e7fd5cad6aa2c52223fd30efd Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Mon, 12 Nov 2012 15:46:10 -0800 Subject: Simplify AudioRecord::restoreTrack_l() Finish removing CBLK_RESTORING and CBLK_RESTORED from control block flags, and remove constant RESTORE_TIMEOUT_MS. Also minor cleanup: - Cache mCblk in local variable cblk and make cblk allocatable in a register. - Use "iMem" for sp. - Add missing error log to AudioRecord; it was already in AudioTrack. This is part of a series to clean up the control block. Change-Id: Ia5f5ab4763c392bc06a45851b167ddaee29e3455 --- include/private/media/AudioTrackShared.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include/private') diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h index ac5372f..3063448 100644 --- a/include/private/media/AudioTrackShared.h +++ b/include/private/media/AudioTrackShared.h @@ -31,17 +31,12 @@ 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 #define CBLK_FORCEREADY 0x02 // set: track is considered ready immediately by AudioFlinger, // 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 // Important: do not add any virtual methods, including ~ struct audio_track_cblk_t -- cgit v1.1