diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2014-11-06 17:49:48 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2014-11-06 17:49:48 -0800 |
| commit | e1a2df553a6d151807a5da738a3cd853bef908d9 (patch) | |
| tree | 9015c1c9ad9ec69f1962657f70fe3df386fbb05a /media/libstagefright/httplive/M3UParser.h | |
| parent | bcf093bfef277a8ec0119da9e84e5abac58ad0b1 (diff) | |
| parent | 841daebc75fbf5e7fb4dd71cab559b8f4d7150ae (diff) | |
| download | frameworks_av-e1a2df553a6d151807a5da738a3cd853bef908d9.zip frameworks_av-e1a2df553a6d151807a5da738a3cd853bef908d9.tar.gz frameworks_av-e1a2df553a6d151807a5da738a3cd853bef908d9.tar.bz2 | |
Resolve conflict
Diffstat (limited to 'media/libstagefright/httplive/M3UParser.h')
| -rw-r--r-- | media/libstagefright/httplive/M3UParser.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/media/libstagefright/httplive/M3UParser.h b/media/libstagefright/httplive/M3UParser.h index ccd6556..d588afe 100644 --- a/media/libstagefright/httplive/M3UParser.h +++ b/media/libstagefright/httplive/M3UParser.h @@ -34,6 +34,7 @@ struct M3UParser : public RefBase { bool isVariantPlaylist() const; bool isComplete() const; bool isEvent() const; + size_t getDiscontinuitySeq() const; sp<AMessage> meta(); @@ -42,7 +43,8 @@ struct M3UParser : public RefBase { void pickRandomMediaItems(); status_t selectTrack(size_t index, bool select); - status_t getTrackInfo(Parcel* reply) const; + size_t getTrackCount() const; + sp<AMessage> getTrackInfo(size_t index) const; ssize_t getSelectedIndex() const; bool getTypeURI(size_t index, const char *key, AString *uri) const; @@ -65,6 +67,7 @@ private: bool mIsVariantPlaylist; bool mIsComplete; bool mIsEvent; + size_t mDiscontinuitySeq; sp<AMessage> mMeta; Vector<Item> mItems; @@ -93,6 +96,8 @@ private: status_t parseMedia(const AString &line); + static status_t parseDiscontinuitySequence(const AString &line, size_t *seq); + static status_t ParseInt32(const char *s, int32_t *x); static status_t ParseDouble(const char *s, double *x); |