diff options
| author | Robert Shih <robertshih@google.com> | 2014-11-13 17:23:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-13 17:23:27 +0000 |
| commit | e0b7ddcda9b4fb493cc365c92293ed7d12c3208a (patch) | |
| tree | 691786a94cf11e731aea75939a95a5f0612088ba /media/libstagefright/httplive/PlaylistFetcher.cpp | |
| parent | 869e0798bbb51af570b4d6ef750f2c21e6b94c8a (diff) | |
| parent | bf20727f0aaf609bc3b495b07b45822b137d21ba (diff) | |
| download | frameworks_av-e0b7ddcda9b4fb493cc365c92293ed7d12c3208a.zip frameworks_av-e0b7ddcda9b4fb493cc365c92293ed7d12c3208a.tar.gz frameworks_av-e0b7ddcda9b4fb493cc365c92293ed7d12c3208a.tar.bz2 | |
Merge "PlaylistFetcher: check ts program streams before disabling a/v" into lmp-mr1-dev
Diffstat (limited to 'media/libstagefright/httplive/PlaylistFetcher.cpp')
| -rw-r--r-- | media/libstagefright/httplive/PlaylistFetcher.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/httplive/PlaylistFetcher.cpp b/media/libstagefright/httplive/PlaylistFetcher.cpp index eb3154a..e4ea034 100644 --- a/media/libstagefright/httplive/PlaylistFetcher.cpp +++ b/media/libstagefright/httplive/PlaylistFetcher.cpp @@ -963,8 +963,8 @@ void PlaylistFetcher::onDownloadNext() { } while (bytesRead != 0); if (bufferStartsWithTsSyncByte(buffer)) { - // If we still don't see a stream after fetching a full ts segment mark it as - // nonexistent. + // If we don't see a stream in the program table after fetching a full ts segment + // mark it as nonexistent. const size_t kNumTypes = ATSParser::NUM_SOURCE_TYPES; ATSParser::SourceType srcTypes[kNumTypes] = { ATSParser::VIDEO, ATSParser::AUDIO }; @@ -979,7 +979,7 @@ void PlaylistFetcher::onDownloadNext() { static_cast<AnotherPacketSource *>( mTSParser->getSource(srcType).get()); - if (source == NULL) { + if (!mTSParser->hasSource(srcType)) { ALOGW("MPEG2 Transport stream does not contain %s data.", srcType == ATSParser::VIDEO ? "video" : "audio"); |