commit 4029672a3533597ea2a7aaa7b17a45674bc70e85
author Robert Shih <robertshih@google.com> Mon Jul 31 16:44:39 2017 -0700
committer Robert Shih <robertshih@google.com> Mon Jul 31 17:31:24 2017 -0700
tree 2b70e4599f19e2ea7cbbd553274610f3a8b928a2
parent b2bae26bf4f537973fcfe4cc620044de3044b525

GenericSource: reset timed text/subtitle after seek

Bug: 62071488
Test: MediaPlayerTest#testSeekWithTimedText
Change-Id: I789c22d186a601d57b4d5ad0d7945590714796a3

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.