diff options
| author | Chong Zhang <chz@google.com> | 2014-07-08 23:30:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-07 17:47:39 +0000 |
| commit | ba5e39b994b44cc458708eedd26c2d50404c9a46 (patch) | |
| tree | fdad016a3634de91ec5e89573bf9d46b0beaf45e /media/libmediaplayerservice/nuplayer | |
| parent | 718cee5f3ba7c0a055fbeced90f26296f8acb117 (diff) | |
| parent | 632740c58119a132ce19f6d498e39c5c3773971a (diff) | |
| download | frameworks_av-ba5e39b994b44cc458708eedd26c2d50404c9a46.zip frameworks_av-ba5e39b994b44cc458708eedd26c2d50404c9a46.tar.gz frameworks_av-ba5e39b994b44cc458708eedd26c2d50404c9a46.tar.bz2 | |
Merge "HLS: do not discard packets when queuing explicit discontinuity"
Diffstat (limited to 'media/libmediaplayerservice/nuplayer')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.cpp | 8 | ||||
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/RTSPSource.cpp | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index 5cf9238..388f77a 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp @@ -272,7 +272,9 @@ void NuPlayer::GenericSource::readBuffer( if (seeking) { track->mPackets->queueDiscontinuity( - ATSParser::DISCONTINUITY_SEEK, NULL); + ATSParser::DISCONTINUITY_SEEK, + NULL, + true /* discard */); } track->mPackets->queueAccessUnit(buffer); @@ -280,7 +282,9 @@ void NuPlayer::GenericSource::readBuffer( } else if (err == INFO_FORMAT_CHANGED) { #if 0 track->mPackets->queueDiscontinuity( - ATSParser::DISCONTINUITY_FORMATCHANGE, NULL); + ATSParser::DISCONTINUITY_FORMATCHANGE, + NULL, + false /* discard */); #endif } else { track->mPackets->signalEOS(err); diff --git a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp index 94800ba..2338b23 100644 --- a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp +++ b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp @@ -505,7 +505,10 @@ void NuPlayer::RTSPSource::onMessageReceived(const sp<AMessage> &msg) { TrackInfo *info = &mTracks.editItemAt(trackIndex); sp<AnotherPacketSource> source = info->mSource; if (source != NULL) { - source->queueDiscontinuity(ATSParser::DISCONTINUITY_SEEK, NULL); + source->queueDiscontinuity( + ATSParser::DISCONTINUITY_SEEK, + NULL, + true /* discard */); } break; |