summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-02-23 13:45:33 -0800
committerAndreas Huber <andih@google.com>2010-02-23 14:06:38 -0800
commitd7d22eba3c1bb7212ccc566fedb16dbee44f51a2 (patch)
treeddeec07f5ebb6f0f7ab93c498b2836e93029abbb /include
parent80bd6a16379a009fbad697fe1c4ffabe0f2630ff (diff)
downloadframeworks_base-d7d22eba3c1bb7212ccc566fedb16dbee44f51a2.zip
frameworks_base-d7d22eba3c1bb7212ccc566fedb16dbee44f51a2.tar.gz
frameworks_base-d7d22eba3c1bb7212ccc566fedb16dbee44f51a2.tar.bz2
Propagate errors all the way through the MediaSources and send either MEDIA_PLAYBACK_COMPLETE or MEDIA_ERROR depending on the final reason for running out of buffers to play back.
related-to-bug: 2463749
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/AudioPlayer.h3
-rw-r--r--include/media/stagefright/OMXCodec.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/include/media/stagefright/AudioPlayer.h b/include/media/stagefright/AudioPlayer.h
index 8e5f05f..ea15a5c 100644
--- a/include/media/stagefright/AudioPlayer.h
+++ b/include/media/stagefright/AudioPlayer.h
@@ -61,7 +61,7 @@ public:
status_t seekTo(int64_t time_us);
bool isSeeking();
- bool reachedEOS();
+ bool reachedEOS(status_t *finalStatus);
private:
sp<MediaSource> mSource;
@@ -81,6 +81,7 @@ private:
bool mSeeking;
bool mReachedEOS;
+ status_t mFinalStatus;
int64_t mSeekTimeUs;
bool mStarted;
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h
index 974075d..24c2f46 100644
--- a/include/media/stagefright/OMXCodec.h
+++ b/include/media/stagefright/OMXCodec.h
@@ -132,6 +132,7 @@ private:
PortStatus mPortStatus[2];
bool mInitialBufferSubmit;
bool mSignalledEOS;
+ status_t mFinalStatus;
bool mNoMoreOutputData;
bool mOutputPortSettingsHaveChanged;
int64_t mSeekTimeUs;