summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/timedtext/TimedTextPlayer.h
diff options
context:
space:
mode:
authorInsun Kang <insun@google.com>2012-06-18 16:51:48 +0900
committerInsun Kang <insun@google.com>2012-08-02 11:56:07 +0900
commit6472badc497a9e748411f8c8c9ed5d83ef335a85 (patch)
tree682bc926abcc04dff0783b1fa4ecb379d2908cb5 /media/libstagefright/timedtext/TimedTextPlayer.h
parentbb6bc8491fe819f96e1902e56694715cb110ce94 (diff)
downloadframeworks_av-6472badc497a9e748411f8c8c9ed5d83ef335a85.zip
frameworks_av-6472badc497a9e748411f8c8c9ed5d83ef335a85.tar.gz
frameworks_av-6472badc497a9e748411f8c8c9ed5d83ef335a85.tar.bz2
Fix: status checking in TimedTextDriver.
o fixes seeking error when there's no enabled text track. o clean up status checking code for deselectTrack. o fixes a potential bug : pause->backward seek can trigger unwanted resume. Bug: 6682160 Change-Id: I03d8788b27fb9c0a6092be83ad3578ccf3266905 (cherry picked from commit 2dafb6071d4f14e0e208912500694912211aa26b)
Diffstat (limited to 'media/libstagefright/timedtext/TimedTextPlayer.h')
-rw-r--r--media/libstagefright/timedtext/TimedTextPlayer.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/timedtext/TimedTextPlayer.h b/media/libstagefright/timedtext/TimedTextPlayer.h
index d8f83af..ec8ed25 100644
--- a/media/libstagefright/timedtext/TimedTextPlayer.h
+++ b/media/libstagefright/timedtext/TimedTextPlayer.h
@@ -50,8 +50,9 @@ protected:
private:
enum {
kWhatPause = 'paus',
- kWhatSeek = 'seek',
kWhatResume = 'resm',
+ kWhatStart = 'strt',
+ kWhatSeek = 'seek',
kWhatRetryRead = 'read',
kWhatSendSubtitle = 'send',
kWhatSetSource = 'ssrc',
@@ -64,6 +65,8 @@ private:
wp<MediaPlayerBase> mListener;
sp<TimedTextSource> mSource;
+ int64_t mPendingSeekTimeUs;
+ bool mPaused;
int32_t mSendSubtitleGeneration;
void doSeekAndRead(int64_t seekTimeUs);