diff options
author | Wei Jia <wjia@google.com> | 2014-12-15 22:04:10 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-15 22:04:10 +0000 |
commit | f1596a66a32072d8cdf7b5e877bdaea7033b761b (patch) | |
tree | 3b09c2b2298c1be25f9536b319e7bce8c70a99cc /media | |
parent | 96143d433419e789c5667a54d54ca0241f3286f0 (diff) | |
parent | dc039672b8fad7746200ecc36304d0e85db4f367 (diff) | |
download | frameworks_av-f1596a66a32072d8cdf7b5e877bdaea7033b761b.zip frameworks_av-f1596a66a32072d8cdf7b5e877bdaea7033b761b.tar.gz frameworks_av-f1596a66a32072d8cdf7b5e877bdaea7033b761b.tar.bz2 |
am dc039672: am a0b3a0a4: am 6e430fbd: Merge "NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable." into lmp-mr1-dev
* commit 'dc039672b8fad7746200ecc36304d0e85db4f367':
NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable.
Diffstat (limited to 'media')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 4 | ||||
-rw-r--r-- | media/libstagefright/httplive/LiveSession.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index 080cd52..a28591e 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -1667,6 +1667,10 @@ void NuPlayer::onSourceNotify(const sp<AMessage> &msg) { sp<NuPlayerDriver> driver = mDriver.promote(); if (driver != NULL) { + if ((flags & NuPlayer::Source::FLAG_CAN_SEEK) == 0) { + driver->notifyListener( + MEDIA_INFO, MEDIA_INFO_NOT_SEEKABLE, 0); + } driver->notifyFlagsChanged(flags); } diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index 6522ad7..04005bd 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -1110,11 +1110,11 @@ status_t LiveSession::onSeek(const sp<AMessage> &msg) { } status_t LiveSession::getDuration(int64_t *durationUs) const { - int64_t maxDurationUs = 0ll; + int64_t maxDurationUs = -1ll; for (size_t i = 0; i < mFetcherInfos.size(); ++i) { int64_t fetcherDurationUs = mFetcherInfos.valueAt(i).mDurationUs; - if (fetcherDurationUs >= 0ll && fetcherDurationUs > maxDurationUs) { + if (fetcherDurationUs > maxDurationUs) { maxDurationUs = fetcherDurationUs; } } |