diff options
| author | Wei Jia <wjia@google.com> | 2014-11-07 04:08:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-07 04:08:10 +0000 |
| commit | 33f45b51654999a8b9d29c8f9471794730b85393 (patch) | |
| tree | 7010af3ef8eca50cf2a64454773284f8d8cbc01d /media/libstagefright/mpeg2ts | |
| parent | ac4189aaa472ba7254af71e4e1fbee620680208a (diff) | |
| parent | 6200e7f43d977ad6698f018ee55e2f423ff8a87c (diff) | |
| download | frameworks_av-33f45b51654999a8b9d29c8f9471794730b85393.zip frameworks_av-33f45b51654999a8b9d29c8f9471794730b85393.tar.gz frameworks_av-33f45b51654999a8b9d29c8f9471794730b85393.tar.bz2 | |
am 6200e7f4: am 5cccfce1: Merge "AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek." into lmp-mr1-dev automerge: e86c6d5
* commit '6200e7f43d977ad6698f018ee55e2f423ff8a87c':
AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek.
Diffstat (limited to 'media/libstagefright/mpeg2ts')
| -rw-r--r-- | media/libstagefright/mpeg2ts/ATSParser.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/mpeg2ts/AnotherPacketSource.cpp | 4 |
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; |