summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioTrack.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2015-10-22 15:28:15 -0700
committerSteve Kondik <steve@cyngn.com>2015-11-30 17:02:52 -0800
commit6cdcb6a06573dfdc072a66c702eee90e21958dd4 (patch)
tree446064dec4f1e609a0a14a1872882dec4b85d17d /media/libmedia/AudioTrack.cpp
parent742132a032ddc1dafc13f5d152ae99853ff4b69c (diff)
downloadframeworks_av-6cdcb6a06573dfdc072a66c702eee90e21958dd4.zip
frameworks_av-6cdcb6a06573dfdc072a66c702eee90e21958dd4.tar.gz
frameworks_av-6cdcb6a06573dfdc072a66c702eee90e21958dd4.tar.bz2
Workaround for busy wait bug
Underlying bug 25195759 is not yet fixed. Bug: 24263351 Change-Id: I04b644246640054d38c8de79e0eb80fcbfef0e48
Diffstat (limited to 'media/libmedia/AudioTrack.cpp')
-rw-r--r--media/libmedia/AudioTrack.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 0541f21..b969449 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -2016,7 +2016,8 @@ nsecs_t AudioTrack::processAudioBuffer()
if (err != NO_ERROR) {
if (err == TIMED_OUT || err == WOULD_BLOCK || err == -EINTR ||
(isOffloaded() && (err == DEAD_OBJECT))) {
- return 0;
+ // FIXME bug 25195759
+ return 1000000;
}
ALOGE("Error %d obtaining an audio buffer, giving up.", err);
return NS_NEVER;