summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/GenericSource.cpp
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2014-10-31 17:57:05 -0700
committerWei Jia <wjia@google.com>2014-11-06 09:57:19 -0800
commitfef808d42a9c94b0b5ef3c3d5fb0a090edbc42da (patch)
tree94c39efa1b2c3cc6a3b40cf2b6e5f087dd6f917b /media/libmediaplayerservice/nuplayer/GenericSource.cpp
parent151b3f41ffcdf187580542ba0c0d3b84df16beed (diff)
downloadframeworks_av-fef808d42a9c94b0b5ef3c3d5fb0a090edbc42da.zip
frameworks_av-fef808d42a9c94b0b5ef3c3d5fb0a090edbc42da.tar.gz
frameworks_av-fef808d42a9c94b0b5ef3c3d5fb0a090edbc42da.tar.bz2
AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek.
This will remove the unnecessary flush for seek. Bug: 17511837 Change-Id: I4b7acfc71a410372f5c630afb94b6a95d09d8974
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/GenericSource.cpp')
-rw-r--r--media/libmediaplayerservice/nuplayer/GenericSource.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index 6859a1a..0e520a8 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -1311,11 +1311,9 @@ void NuPlayer::GenericSource::readBuffer(
if ((seeking || formatChange)
&& (trackType == MEDIA_TRACK_TYPE_AUDIO
|| trackType == MEDIA_TRACK_TYPE_VIDEO)) {
- ATSParser::DiscontinuityType type = formatChange
- ? (seeking
- ? ATSParser::DISCONTINUITY_FORMATCHANGE
- : ATSParser::DISCONTINUITY_NONE)
- : ATSParser::DISCONTINUITY_SEEK;
+ ATSParser::DiscontinuityType type = (formatChange && seeking)
+ ? ATSParser::DISCONTINUITY_FORMATCHANGE
+ : ATSParser::DISCONTINUITY_NONE;
track->mPackets->queueDiscontinuity( type, NULL, true /* discard */);
}