diff options
author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-10-12 17:06:36 -0700 |
---|---|---|
committer | Jean-Michel Trivi <jmtrivi@google.com> | 2010-10-12 17:19:03 -0700 |
commit | 98a1f3f49f963eb6608771993edc69b2b0d549fa (patch) | |
tree | ce57555845904726e1cb5703dde64586d1da246a /opensles | |
parent | c35fd2e7ba670b1024a920ebf007b0fa1d92c969 (diff) | |
download | android_system_media-98a1f3f49f963eb6608771993edc69b2b0d549fa.tar.gz android_system_media-98a1f3f49f963eb6608771993edc69b2b0d549fa.tar.bz2 android_system_media-98a1f3f49f963eb6608771993edc69b2b0d549fa.zip |
Fix bug 3090610 Report an error on AAC+
Notify an error occured during prefetching when StageFright
reports that a read error was encountered (other than EOS),
and stop playback.
Change-Id: I0c00ee76b148bd80a26679648322633d6e5533da
Diffstat (limited to 'opensles')
-rw-r--r-- | opensles/libopensles/android_SfPlayer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/opensles/libopensles/android_SfPlayer.cpp b/opensles/libopensles/android_SfPlayer.cpp index d1d63806..ea12dcb6 100644 --- a/opensles/libopensles/android_SfPlayer.cpp +++ b/opensles/libopensles/android_SfPlayer.cpp @@ -531,15 +531,17 @@ void SfPlayer::onDecode() { if (err != OK) { if (err != ERROR_END_OF_STREAM) { SL_LOGE("MediaSource::read returned error %d", err); - // FIXME handle error + pause(); + notifyPrepared(err); + return; } else { // handle notification and looping at end of stream if (0 < mDurationUsec) { mLastDecodedPositionUs = mDurationUsec; } reachedEndOfStream(); + return; } - return; } // render |