diff options
author | Andreas Huber <andih@google.com> | 2010-10-08 10:16:24 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2010-10-08 10:16:24 -0700 |
commit | 70f521de2675ce6eedf4b22beed94ea1289b0f38 (patch) | |
tree | fe477ecc5b9fbec01d41a458cc17bcf867f9809d /media/libstagefright | |
parent | f4ea1f92bc56a8ffceddba0dbd3979fe0219b13c (diff) | |
download | frameworks_av-70f521de2675ce6eedf4b22beed94ea1289b0f38.zip frameworks_av-70f521de2675ce6eedf4b22beed94ea1289b0f38.tar.gz frameworks_av-70f521de2675ce6eedf4b22beed94ea1289b0f38.tar.bz2 |
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.
Change-Id: I016e79b688774f8ee91ac53216197b5fb9cb41b2
related-to-bug: 3073955
Diffstat (limited to 'media/libstagefright')
-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 |
3 files changed, 10 insertions, 4 deletions
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(); |