diff options
author | Andreas Huber <andih@google.com> | 2012-11-28 09:42:18 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-28 09:42:18 -0800 |
commit | 7b7f17dc9b30ff4ecdf0aea9bcfa1c518d4ac1e7 (patch) | |
tree | c4d499fae337e16f9e36f75417bc4e5f61a4f82b /include/media | |
parent | 5d7b2778d0e9849fa601d722ec2efcee7d032d4f (diff) | |
parent | b7c8e91880463ff4981e3e53e98e45d68e2fe374 (diff) | |
download | frameworks_av-7b7f17dc9b30ff4ecdf0aea9bcfa1c518d4ac1e7.zip frameworks_av-7b7f17dc9b30ff4ecdf0aea9bcfa1c518d4ac1e7.tar.gz frameworks_av-7b7f17dc9b30ff4ecdf0aea9bcfa1c518d4ac1e7.tar.bz2 |
am b7c8e918: Add support for HLS playlists of type \'event\'.
* commit 'b7c8e91880463ff4981e3e53e98e45d68e2fe374':
Add support for HLS playlists of type 'event'.
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/IStreamSource.h | 5 | ||||
-rw-r--r-- | include/media/mediaplayer.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/media/IStreamSource.h b/include/media/IStreamSource.h index 61b9d5a..39e0a9e 100644 --- a/include/media/IStreamSource.h +++ b/include/media/IStreamSource.h @@ -73,6 +73,11 @@ struct IStreamListener : public IInterface { // ATSParser::DiscontinuityType. static const char *const kKeyDiscontinuityMask; + // Optionally signalled as part of a discontinuity that includes + // DISCONTINUITY_TIME. It indicates the media time (in us) to be associated + // with the next PTS occuring in the stream. The value is of type int64_t. + static const char *const kKeyMediaTimeUs; + virtual void issueCommand( Command cmd, bool synchronous, const sp<AMessage> &msg = NULL) = 0; }; diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index f7cebc5..d753eba 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -249,7 +249,6 @@ private: sp<MediaPlayerListener> mListener; void* mCookie; media_player_states mCurrentState; - int mDuration; int mCurrentPosition; int mSeekPosition; bool mPrepareSync; |