diff options
author | Andreas Huber <andih@google.com> | 2011-01-05 16:24:27 -0800 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2011-01-05 16:24:27 -0800 |
commit | 22fc52f6f72f39e33c3970d0291de3569118aa5c (patch) | |
tree | 3f446d7a2aa1e0e701b0ce33a10175547eb29bdf /media/libstagefright/mpeg2ts/AnotherPacketSource.cpp | |
parent | 43c3e6ce02215ca99d506458f596cb1211639f29 (diff) | |
download | frameworks_av-22fc52f6f72f39e33c3970d0291de3569118aa5c.zip frameworks_av-22fc52f6f72f39e33c3970d0291de3569118aa5c.tar.gz frameworks_av-22fc52f6f72f39e33c3970d0291de3569118aa5c.tar.bz2 |
Some more fixes regarding HTTP live in NuPlayer.
Change-Id: I9e29615fa8ee6c7bd4189373a75c20caef3fd2b1
Diffstat (limited to 'media/libstagefright/mpeg2ts/AnotherPacketSource.cpp')
-rw-r--r-- | media/libstagefright/mpeg2ts/AnotherPacketSource.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp index c6edf0a..0ad883b 100644 --- a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp +++ b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp @@ -142,16 +142,23 @@ void AnotherPacketSource::queueDiscontinuity( Mutex::Autolock autoLock(mLock); +#if 0 + if (type == ATSParser::DISCONTINUITY_SEEK + || type == ATSParser::DISCONTINUITY_FORMATCHANGE) { + // XXX Fix this: This will also clear any pending discontinuities, + // If there's a pending DISCONTINUITY_FORMATCHANGE and the new + // discontinuity is "just" a DISCONTINUITY_SEEK, this will effectively + // downgrade the type of discontinuity received by the client. + + mBuffers.clear(); + mEOSResult = OK; + } +#endif + mBuffers.push_back(buffer); mCondition.signal(); } -void AnotherPacketSource::clear() { - Mutex::Autolock autoLock(mLock); - mBuffers.clear(); - mEOSResult = OK; -} - void AnotherPacketSource::signalEOS(status_t result) { CHECK(result != OK); |