summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/RTSPSource.h
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2015-07-13 17:59:36 -0700
committerRobert Shih <robertshih@google.com>2015-07-16 14:34:03 -0700
commit8d237a5ce1e3c1dbc1d538f47e68cff2cc52d799 (patch)
tree3e77dfb6324d3a7bf390d6c6e6c576b897ad8cd5 /media/libmediaplayerservice/nuplayer/RTSPSource.h
parent11addc1d922efa0bf12e261481bba11024c7c7ab (diff)
downloadframeworks_av-8d237a5ce1e3c1dbc1d538f47e68cff2cc52d799.zip
frameworks_av-8d237a5ce1e3c1dbc1d538f47e68cff2cc52d799.tar.gz
frameworks_av-8d237a5ce1e3c1dbc1d538f47e68cff2cc52d799.tar.bz2
RTSP: clear data/eos status before returning from seek
The original RTSP seek implementation involves pausing and restarting a session. This change clears data/eos status after an rtsp session is paused for a seek, and delays the seek to return after data/eos status are cleared. Bug: 22207372 Change-Id: I1bdf65653f90436f7ee5d7fe85eeadc1598a0d56
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/RTSPSource.h')
-rw-r--r--media/libmediaplayerservice/nuplayer/RTSPSource.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/RTSPSource.h b/media/libmediaplayerservice/nuplayer/RTSPSource.h
index 5f2cf33..6438a1e 100644
--- a/media/libmediaplayerservice/nuplayer/RTSPSource.h
+++ b/media/libmediaplayerservice/nuplayer/RTSPSource.h
@@ -116,6 +116,8 @@ private:
int64_t mEOSTimeoutAudio;
int64_t mEOSTimeoutVideo;
+ sp<AReplyToken> mSeekReplyID;
+
sp<AnotherPacketSource> getSource(bool audio);
void onConnected();
@@ -131,6 +133,7 @@ private:
void setError(status_t err);
void startBufferingIfNecessary();
bool stopBufferingIfNecessary();
+ void finishSeek(status_t err);
DISALLOW_EVIL_CONSTRUCTORS(RTSPSource);
};