diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-09 18:03:43 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-09 18:03:43 -0700 |
| commit | dcd0bba9cf3b2c7f942604f1f04c711ddce963e2 (patch) | |
| tree | a44c978bec7255e61eb095211ac9eb03ad809a67 /media/libmediaplayerservice | |
| parent | f576802217aa1b1f8944962624333326600f0ee5 (diff) | |
| parent | 906e4fdbc8c5882c371abf84fbeedda2b54f67fc (diff) | |
| download | frameworks_av-dcd0bba9cf3b2c7f942604f1f04c711ddce963e2.zip frameworks_av-dcd0bba9cf3b2c7f942604f1f04c711ddce963e2.tar.gz frameworks_av-dcd0bba9cf3b2c7f942604f1f04c711ddce963e2.tar.bz2 | |
Merge "httplive: Ignore seek request for livestreaming"
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp index 6683481..a57fdc1 100644 --- a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp +++ b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp @@ -212,7 +212,11 @@ status_t NuPlayer::HTTPLiveSource::selectTrack(size_t trackIndex, bool select, i } status_t NuPlayer::HTTPLiveSource::seekTo(int64_t seekTimeUs) { - return mLiveSession->seekTo(seekTimeUs); + if (mLiveSession->isSeekable()) { + return mLiveSession->seekTo(seekTimeUs); + } else { + return INVALID_OPERATION; + } } void NuPlayer::HTTPLiveSource::pollForRawData( |