summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2010-09-30 19:47:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-30 19:47:21 -0700
commit785c416ecf627a550c15f33800fe3091482b181a (patch)
tree6224c4606fb35430cd96bf433b173ca1ae4a9c1b /include
parent13cc0a06fce4ec54574c9bf2084752961a144c24 (diff)
parentde12c3cf56e3f27b2efc60eeae8b5e422747f2b9 (diff)
downloadframeworks_base-785c416ecf627a550c15f33800fe3091482b181a.zip
frameworks_base-785c416ecf627a550c15f33800fe3091482b181a.tar.gz
frameworks_base-785c416ecf627a550c15f33800fe3091482b181a.tar.bz2
am de12c3cf: am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread
Merge commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9' * commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9': Issue 3032913: improve AudioTrack recovery time
Diffstat (limited to 'include')
-rw-r--r--include/private/media/AudioTrackShared.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h
index 1510f87..c6990bf 100644
--- a/include/private/media/AudioTrackShared.h
+++ b/include/private/media/AudioTrackShared.h
@@ -42,8 +42,11 @@ namespace android {
#define CBLK_FORCEREADY_ON 0x0004 // track is considered ready immediately by AudioFlinger
#define CBLK_FORCEREADY_OFF 0x0000 // track is ready when buffer full
#define CBLK_INVALID_MSK 0x0008
-#define CBLK_INVALID_ON 0x0008 // track buffer is invalidated by AudioFlinger: must be re-created
-#define CBLK_INVALID_OFF 0x0000
+#define CBLK_INVALID_ON 0x0008 // track buffer is invalidated by AudioFlinger:
+#define CBLK_INVALID_OFF 0x0000 // must be re-created
+#define CBLK_DISABLED_MSK 0x0010
+#define CBLK_DISABLED_ON 0x0010 // track disabled by AudioFlinger due to underrun:
+#define CBLK_DISABLED_OFF 0x0000 // must be re-started
struct audio_track_cblk_t
{