diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-10-22 15:28:15 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2015-10-22 15:45:03 -0700 |
| commit | 606fbc1030d686bf1f8dc03d14a79342aca2ca41 (patch) | |
| tree | 0394ffc9b5ae6d11957a2123177b62a65d09d5c1 /media/libmedia | |
| parent | e710ae53001bbbf1e1afd6b3f5c3478c673afd0e (diff) | |
| download | frameworks_av-606fbc1030d686bf1f8dc03d14a79342aca2ca41.zip frameworks_av-606fbc1030d686bf1f8dc03d14a79342aca2ca41.tar.gz frameworks_av-606fbc1030d686bf1f8dc03d14a79342aca2ca41.tar.bz2 | |
Workaround for busy wait bug
Underlying bug 25195759 is not yet fixed.
Bug: 24263351
Change-Id: I04b644246640054d38c8de79e0eb80fcbfef0e48
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index d17f7ae..ff5fe1d 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -1980,7 +1980,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; |