diff options
author | Andreas Huber <andih@google.com> | 2011-07-15 16:25:41 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2011-07-15 16:26:47 -0700 |
commit | 2048d0cfccce48be26816dec8711a6691ebff71c (patch) | |
tree | 113376110542a7e55960aaae648bb8a836d4f1c0 /media/libmediaplayerservice | |
parent | 4378ace44b9de477608a6c2fbf7134bc0345555f (diff) | |
download | frameworks_av-2048d0cfccce48be26816dec8711a6691ebff71c.zip frameworks_av-2048d0cfccce48be26816dec8711a6691ebff71c.tar.gz frameworks_av-2048d0cfccce48be26816dec8711a6691ebff71c.tar.bz2 |
Fix seek behaviour at startup and teardown of media session that hasn't been started
Nuplayer specific.
Change-Id: I7b0be52c29bdb7032414d63c503d686df7844bf6
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp | 6 | ||||
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp index 5a5330d..0251baf 100644 --- a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp +++ b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp @@ -58,8 +58,10 @@ NuPlayer::HTTPLiveSource::HTTPLiveSource( } NuPlayer::HTTPLiveSource::~HTTPLiveSource() { - mLiveSession->disconnect(); - mLiveLooper->stop(); + if (mLiveSession != NULL) { + mLiveSession->disconnect(); + mLiveLooper->stop(); + } } void NuPlayer::HTTPLiveSource::start() { diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index 7cd8b6c..c6fca2c 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -118,9 +118,15 @@ status_t NuPlayerDriver::start() { mPlayer->start(); if (mStartupSeekTimeUs >= 0) { - mPlayer->seekToAsync(mStartupSeekTimeUs); + if (mStartupSeekTimeUs == 0) { + notifySeekComplete(); + } else { + mPlayer->seekToAsync(mStartupSeekTimeUs); + } + mStartupSeekTimeUs = -1; } + break; } case PLAYING: |