diff options
author | Andreas Huber <andih@google.com> | 2010-10-08 11:18:03 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-08 11:18:03 -0700 |
commit | abc40fd3f7effc025ccad91d05f5d6bb2a4c857c (patch) | |
tree | 91a79c33daecf61915236eb503fcaa8ceb39c7b5 /media | |
parent | c7e61d5e67a8218d33835a1b5ca0256b30699ae7 (diff) | |
parent | 6f3cba53efdd985ab13734c7ad90eb373ae9b9f7 (diff) | |
download | frameworks_av-abc40fd3f7effc025ccad91d05f5d6bb2a4c857c.zip frameworks_av-abc40fd3f7effc025ccad91d05f5d6bb2a4c857c.tar.gz frameworks_av-abc40fd3f7effc025ccad91d05f5d6bb2a4c857c.tar.bz2 |
am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
Merge commit 'f72dd0190ee64914161d361be1213eda8cab7b90' into gingerbread-plus-aosp
* commit 'f72dd0190ee64914161d361be1213eda8cab7b90':
Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
Diffstat (limited to 'media')
-rw-r--r-- | media/libmediaplayerservice/StagefrightPlayer.cpp | 4 | ||||
-rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 4 | ||||
-rw-r--r-- | media/libstagefright/MediaExtractor.cpp | 2 | ||||
-rw-r--r-- | media/libstagefright/include/ARTSPController.h | 8 |
4 files changed, 14 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/StagefrightPlayer.cpp b/media/libmediaplayerservice/StagefrightPlayer.cpp index 2c96d6d..6bded09 100644 --- a/media/libmediaplayerservice/StagefrightPlayer.cpp +++ b/media/libmediaplayerservice/StagefrightPlayer.cpp @@ -180,6 +180,10 @@ status_t StagefrightPlayer::getMetadata( Metadata::kSeekForwardAvailable, flags & MediaExtractor::CAN_SEEK_FORWARD); + metadata.appendBool( + Metadata::kSeekAvailable, + flags & MediaExtractor::CAN_SEEK); + return OK; } diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 8c17aab..53543b3 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -868,9 +868,7 @@ status_t AwesomePlayer::getPosition(int64_t *positionUs) { } status_t AwesomePlayer::seekTo(int64_t timeUs) { - if (mExtractorFlags - & (MediaExtractor::CAN_SEEK_FORWARD - | MediaExtractor::CAN_SEEK_BACKWARD)) { + if (mExtractorFlags & MediaExtractor::CAN_SEEK) { Mutex::Autolock autoLock(mLock); return seekTo_l(timeUs); } diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp index 9bc94de..8a5fb11 100644 --- a/media/libstagefright/MediaExtractor.cpp +++ b/media/libstagefright/MediaExtractor.cpp @@ -41,7 +41,7 @@ sp<MetaData> MediaExtractor::getMetaData() { } uint32_t MediaExtractor::flags() const { - return CAN_SEEK_BACKWARD | CAN_SEEK_FORWARD | CAN_PAUSE; + return CAN_SEEK_BACKWARD | CAN_SEEK_FORWARD | CAN_PAUSE | CAN_SEEK; } // static diff --git a/media/libstagefright/include/ARTSPController.h b/media/libstagefright/include/ARTSPController.h index 300d8f7..c2f3090 100644 --- a/media/libstagefright/include/ARTSPController.h +++ b/media/libstagefright/include/ARTSPController.h @@ -46,6 +46,14 @@ struct ARTSPController : public MediaExtractor { void onMessageReceived(const sp<AMessage> &msg); + virtual uint32_t flags() const { + // 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. + + return CAN_PAUSE | CAN_SEEK; + } + protected: virtual ~ARTSPController(); |