commit 4af61ddad5cb18b08fa4faa956468363e30f3b1c
author Robert Shih <robertshih@google.com> Tue Aug 01 02:41:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 01 02:41:01 2017 +0000
tree 657d75e9ccb34099f943dc95e3cc61261233d361
parent b313c5c751d695e27a5eb0b8491b34bf2e2f8682
parent 87b901caa18f2e5e5a39023fb682eb09d4d832fe

Merge "GenericSource: reset timed text/subtitle after seek" into oc-dr1-dev
am: 87b901caa1

Change-Id: I643afacd79bd58c7acf1873db0cd1b01f09089b9

media/libmediaplayerservice/nuplayer/GenericSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index d83c406..aa21fff 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -1242,6 +1242,16 @@
         mAudioLastDequeueTimeUs = seekTimeUs;
     }
 
+    if (mSubtitleTrack.mSource != NULL) {
+        mSubtitleTrack.mPackets->clear();
+        mFetchSubtitleDataGeneration++;
+    }
+
+    if (mTimedTextTrack.mSource != NULL) {
+        mTimedTextTrack.mPackets->clear();
+        mFetchTimedTextDataGeneration++;
+    }
+
     // If currently buffering, post kWhatBufferingEnd first, so that
     // NuPlayer resumes. Otherwise, if cache hits high watermark
     // before new polling happens, no one will resume the playback.