summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/mpeg2ts
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/libstagefright/mpeg2ts
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/libstagefright/mpeg2ts')
-rw-r--r--media/libstagefright/mpeg2ts/ATSParser.h2
-rw-r--r--media/libstagefright/mpeg2ts/AnotherPacketSource.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/mpeg2ts/ATSParser.h b/media/libstagefright/mpeg2ts/ATSParser.h
index 8986a22..204934d 100644
--- a/media/libstagefright/mpeg2ts/ATSParser.h
+++ b/media/libstagefright/mpeg2ts/ATSParser.h
@@ -41,8 +41,6 @@ struct ATSParser : public RefBase {
DISCONTINUITY_ABSOLUTE_TIME = 8,
DISCONTINUITY_TIME_OFFSET = 16,
- DISCONTINUITY_SEEK = DISCONTINUITY_TIME,
-
// For legacy reasons this also implies a time discontinuity.
DISCONTINUITY_FORMATCHANGE =
DISCONTINUITY_AUDIO_FORMAT
diff --git a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
index a03f6f9..ed40bdd 100644
--- a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
+++ b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
@@ -262,6 +262,10 @@ void AnotherPacketSource::queueDiscontinuity(
}
}
+ if (type == ATSParser::DISCONTINUITY_NONE) {
+ return;
+ }
+
mEOSResult = OK;
mLastQueuedTimeUs = 0;
mLatestEnqueuedMeta = NULL;