diff options
| author | Robert Shih <robertshih@google.com> | 2014-09-18 00:05:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-18 00:05:44 +0000 |
| commit | 2973994af39d55b58728df3dca067594e826ea2a (patch) | |
| tree | f46cca74961e3f462c51d7702bf51a96174925d8 /media/libstagefright | |
| parent | 21a1d72bb42710d149532653490154f89330b9dd (diff) | |
| parent | 15f8ecfa23b650b3efa8fe841d2be6bd0c9523fb (diff) | |
| download | frameworks_av-2973994af39d55b58728df3dca067594e826ea2a.zip frameworks_av-2973994af39d55b58728df3dca067594e826ea2a.tar.gz frameworks_av-2973994af39d55b58728df3dca067594e826ea2a.tar.bz2 | |
Merge "PlaylistFetcher:don't signal a/v eos on subttitle eos" into lmp-dev
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/httplive/LiveSession.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index 7786c27..b465566 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -443,6 +443,23 @@ void LiveSession::onMessageReceived(const sp<AMessage> &msg) { ALOGE("XXX Received error %d from PlaylistFetcher.", err); + // handle EOS on subtitle tracks independently + AString uri; + if (err == ERROR_END_OF_STREAM && msg->findString("uri", &uri)) { + ssize_t i = mFetcherInfos.indexOfKey(uri); + if (i >= 0) { + const sp<PlaylistFetcher> &fetcher = mFetcherInfos.valueAt(i).mFetcher; + if (fetcher != NULL) { + uint32_t type = fetcher->getStreamTypeMask(); + if (type == STREAMTYPE_SUBTITLES) { + mPacketSources.valueFor( + STREAMTYPE_SUBTITLES)->signalEOS(err);; + break; + } + } + } + } + if (mInPreparationPhase) { postPrepared(err); } |