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 | 2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7 (patch) | |
| tree | 398decc9b6a98cf073b75b230dbcd550363b7e3e /include | |
| parent | 5dcf588a81a59142985736d8bb0430586f68ec08 (diff) | |
| parent | f72dd0190ee64914161d361be1213eda8cab7b90 (diff) | |
| download | frameworks_base-2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7.zip frameworks_base-2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7.tar.gz frameworks_base-2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7.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 'include')
| -rw-r--r-- | include/media/Metadata.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/MediaExtractor.h | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/media/Metadata.h b/include/media/Metadata.h index 241868a..9c915ce 100644 --- a/include/media/Metadata.h +++ b/include/media/Metadata.h @@ -91,6 +91,7 @@ class Metadata { static const Type kPauseAvailable = 29; // Boolean static const Type kSeekBackwardAvailable = 30; // Boolean static const Type kSeekForwardAvailable = 31; // Boolean + static const Type kSeekAvailable = 32; // Boolean // @param p[inout] The parcel to append the metadata records // to. The global metadata header should have been set already. diff --git a/include/media/stagefright/MediaExtractor.h b/include/media/stagefright/MediaExtractor.h index 21338ca..16b0a4c 100644 --- a/include/media/stagefright/MediaExtractor.h +++ b/include/media/stagefright/MediaExtractor.h @@ -45,13 +45,14 @@ public: virtual sp<MetaData> getMetaData(); enum Flags { - CAN_SEEK_BACKWARD = 1, - CAN_SEEK_FORWARD = 2, + CAN_SEEK_BACKWARD = 1, // the "seek 10secs back button" + CAN_SEEK_FORWARD = 2, // the "seek 10secs forward button" CAN_PAUSE = 4, + CAN_SEEK = 8, // the "seek bar" }; // If subclasses do _not_ override this, the default is - // CAN_SEEK_BACKWARD | CAN_SEEK_FORWARD | CAN_PAUSE + // CAN_SEEK_BACKWARD | CAN_SEEK_FORWARD | CAN_SEEK | CAN_PAUSE virtual uint32_t flags() const; protected: |