From: Robert Shih <robertshih@google.com>
Date: Mon, 31 Jul 2017 23:44:39 +0000 (-0700)
Subject: GenericSource: reset timed text/subtitle after seek
X-Git-Tag: android-x86-8.1-r1~71^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4029672a3533597ea2a7aaa7b17a45674bc70e85;p=android-x86%2Fframeworks-av.git

GenericSource: reset timed text/subtitle after seek

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

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index d83c40619e..aa21fff23d 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -1242,6 +1242,16 @@ status_t NuPlayer::GenericSource::doSeek(int64_t seekTimeUs, MediaPlayerSeekMode
         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.