diff options
| author | Wei Jia <wjia@google.com> | 2014-11-13 23:06:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-13 23:06:11 +0000 |
| commit | 12acd3f0374e7707ff50c04f8075883be71b128c (patch) | |
| tree | 19f4d335d925a8d402295fa8966ec8190647b918 /media/libstagefright/mpeg2ts | |
| parent | 6641004be544a394f3fca81f7213dd6e0668ff98 (diff) | |
| parent | 87e8123d4d6058fbd50065a4fb18a0bdb6989b3f (diff) | |
| download | frameworks_av-12acd3f0374e7707ff50c04f8075883be71b128c.zip frameworks_av-12acd3f0374e7707ff50c04f8075883be71b128c.tar.gz frameworks_av-12acd3f0374e7707ff50c04f8075883be71b128c.tar.bz2 | |
Merge "AnotherPacketSource: need reset some members before returning from queueDiscontinuity()." into lmp-mr1-dev
Diffstat (limited to 'media/libstagefright/mpeg2ts')
| -rw-r--r-- | media/libstagefright/mpeg2ts/AnotherPacketSource.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp index ed40bdd..c579d4c 100644 --- a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp +++ b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp @@ -262,15 +262,15 @@ void AnotherPacketSource::queueDiscontinuity( } } + mEOSResult = OK; + mLastQueuedTimeUs = 0; + mLatestEnqueuedMeta = NULL; + if (type == ATSParser::DISCONTINUITY_NONE) { return; } - mEOSResult = OK; - mLastQueuedTimeUs = 0; - mLatestEnqueuedMeta = NULL; ++mQueuedDiscontinuityCount; - sp<ABuffer> buffer = new ABuffer(0); buffer->meta()->setInt32("discontinuity", static_cast<int32_t>(type)); buffer->meta()->setMessage("extra", extra); |