diff options
| author | Chong Zhang <chz@google.com> | 2013-09-16 11:20:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-16 11:20:11 -0700 |
| commit | 5ee1f4fe66d15e8554352829771bf27913ea0b14 (patch) | |
| tree | fed3950c27a17ebf9184b961198033c05f92fe59 /media/libmediaplayerservice | |
| parent | 1bcd8e9f74ac5c50a2888465aa38cc6f24eca997 (diff) | |
| parent | fcb7a2472bcb3c7985888acdb9905ba4e21c6bfe (diff) | |
| download | frameworks_av-5ee1f4fe66d15e8554352829771bf27913ea0b14.zip frameworks_av-5ee1f4fe66d15e8554352829771bf27913ea0b14.tar.gz frameworks_av-5ee1f4fe66d15e8554352829771bf27913ea0b14.tar.bz2 | |
am fcb7a247: am a5652e9c: Merge "Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flags" into klp-dev
* commit 'fcb7a2472bcb3c7985888acdb9905ba4e21c6bfe':
Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flags
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 5 | ||||
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/RTSPSource.cpp | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index e1735fa..750287f 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -1396,6 +1396,11 @@ void NuPlayer::onSourceNotify(const sp<AMessage> &msg) { uint32_t flags; CHECK(msg->findInt32("flags", (int32_t *)&flags)); + sp<NuPlayerDriver> driver = mDriver.promote(); + if (driver != NULL) { + driver->notifyFlagsChanged(flags); + } + if ((mSourceFlags & Source::FLAG_DYNAMIC_DURATION) && (!(flags & Source::FLAG_DYNAMIC_DURATION))) { cancelPollDuration(); diff --git a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp index 3385a19..18cf6d1 100644 --- a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp +++ b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp @@ -358,11 +358,10 @@ void NuPlayer::RTSPSource::onMessageReceived(const sp<AMessage> &msg) { uint32_t flags = 0; if (mHandler->isSeekable()) { - flags = FLAG_CAN_PAUSE | FLAG_CAN_SEEK; - - // Seeking 10secs forward or backward is a very expensive - // operation for rtsp, so let's not enable that. - // The user can always use the seek bar. + flags = FLAG_CAN_PAUSE + | FLAG_CAN_SEEK + | FLAG_CAN_SEEK_BACKWARD + | FLAG_CAN_SEEK_FORWARD; } notifyFlagsChanged(flags); |