summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/mpeg2ts
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2015-05-08 17:39:40 -0700
committerRobert Shih <robertshih@google.com>2015-05-11 11:18:52 -0700
commitaabbdc7401ae24a4199f12a283985deb648673c0 (patch)
tree947b5414363dfd110f30728b61b38ad3b927dc0f /media/libstagefright/mpeg2ts
parentd02ac2c7286ca7190ddaf861095cd0b16e28da1e (diff)
downloadframeworks_av-aabbdc7401ae24a4199f12a283985deb648673c0.zip
frameworks_av-aabbdc7401ae24a4199f12a283985deb648673c0.tar.gz
frameworks_av-aabbdc7401ae24a4199f12a283985deb648673c0.tar.bz2
HLS: invoke signalEOS on ATSParser to flush out final samples
Also clear EOS status when we reset ATSParser. Bug: 20959760 Change-Id: I730234acf3cdbee08affe0f28b7e8759e11059cb
Diffstat (limited to 'media/libstagefright/mpeg2ts')
-rw-r--r--media/libstagefright/mpeg2ts/ATSParser.cpp1
-rw-r--r--media/libstagefright/mpeg2ts/ESQueue.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/mpeg2ts/ATSParser.cpp b/media/libstagefright/mpeg2ts/ATSParser.cpp
index 0d071b2..e8b2219 100644
--- a/media/libstagefright/mpeg2ts/ATSParser.cpp
+++ b/media/libstagefright/mpeg2ts/ATSParser.cpp
@@ -746,6 +746,7 @@ void ATSParser::Stream::signalDiscontinuity(
}
mPayloadStarted = false;
+ mEOSReached = false;
mBuffer->setRange(0, 0);
bool clearFormat = false;
diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp
index 7b5b46a..baf3b15 100644
--- a/media/libstagefright/mpeg2ts/ESQueue.cpp
+++ b/media/libstagefright/mpeg2ts/ESQueue.cpp
@@ -56,6 +56,8 @@ void ElementaryStreamQueue::clear(bool clearFormat) {
if (clearFormat) {
mFormat.clear();
}
+
+ mEOSReached = false;
}
// Parse AC3 header assuming the current ptr is start position of syncframe,