From 87e8123d4d6058fbd50065a4fb18a0bdb6989b3f Mon Sep 17 00:00:00 2001
From: Wei Jia <wjia@google.com>
Date: Wed, 12 Nov 2014 15:37:07 -0800
Subject: AnotherPacketSource: need reset some members before returning from
 queueDiscontinuity().

Bug: 18355014
Bug: 17511837

Change-Id: I4b623d3bc4fbeaf0e8bf4ddd96661469d17afe7a
---
 media/libstagefright/mpeg2ts/AnotherPacketSource.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'media/libstagefright/mpeg2ts')

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);
-- 
cgit v1.1