diff options
| author | Andreas Huber <andih@google.com> | 2011-09-27 13:36:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-27 13:36:22 -0700 |
| commit | dd115cd3b1429a39f1c8e77cbdf03e760ebdb6c3 (patch) | |
| tree | ed3e70d787dbc6fd3e9a2ebb59ad7d088251c7fb /media/libmediaplayerservice/nuplayer/StreamingSource.h | |
| parent | 82fd03b854a5e6879dc9eb6d57962414e7082894 (diff) | |
| parent | eac68baf095aeef54865c28b6888924dc6295cbd (diff) | |
| download | frameworks_av-dd115cd3b1429a39f1c8e77cbdf03e760ebdb6c3.zip frameworks_av-dd115cd3b1429a39f1c8e77cbdf03e760ebdb6c3.tar.gz frameworks_av-dd115cd3b1429a39f1c8e77cbdf03e760ebdb6c3.tar.bz2 | |
Merge "Signal an appropriate error even if there are no active streams yet."
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/StreamingSource.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/StreamingSource.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/nuplayer/StreamingSource.h b/media/libmediaplayerservice/nuplayer/StreamingSource.h index 7abce84..ca00ef9 100644 --- a/media/libmediaplayerservice/nuplayer/StreamingSource.h +++ b/media/libmediaplayerservice/nuplayer/StreamingSource.h @@ -31,8 +31,7 @@ struct NuPlayer::StreamingSource : public NuPlayer::Source { virtual void start(); - // Returns true iff more data was available, false on EOS. - virtual bool feedMoreTSData(); + virtual status_t feedMoreTSData(); virtual sp<MetaData> getFormat(bool audio); virtual status_t dequeueAccessUnit(bool audio, sp<ABuffer> *accessUnit); @@ -42,7 +41,7 @@ protected: private: sp<IStreamSource> mSource; - bool mEOS; + status_t mFinalResult; sp<NuPlayerStreamListener> mStreamListener; sp<ATSParser> mTSParser; |