diff options
author | Andreas Huber <andih@google.com> | 2011-03-18 14:38:56 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2011-03-18 15:11:52 -0700 |
commit | d42573cace9db2b5948e540c32beaef80f04153c (patch) | |
tree | 50702825c0cdf513c41c3ffaaae151fce4eb0aa2 /media/libstagefright/matroska/MatroskaExtractor.h | |
parent | cfee2a39edf05ab0f97595d0ec5bda6a19f03659 (diff) | |
download | frameworks_av-d42573cace9db2b5948e540c32beaef80f04153c.zip frameworks_av-d42573cace9db2b5948e540c32beaef80f04153c.tar.gz frameworks_av-d42573cace9db2b5948e540c32beaef80f04153c.tar.bz2 |
Squashed commit of the following:
commit ed615e2803839ef28e0eab50d17844c207083ad6
Author: Andreas Huber <andih@google.com>
Date: Fri Mar 18 12:38:30 2011 -0700
Support for live streaming of webm content over http.
Change-Id: Ie9ebd23d2c44d192d348b9fa3f3a0f3f28ac9e4c
commit 9c50b1392471a3d652b4a875c823bee854f8855b
Author: Andreas Huber <andih@google.com>
Date: Thu Mar 17 13:33:22 2011 -0700
Upgrade to the latest version of libwebm.
Change-Id: Ic7965dda84131a38f9d3c72b6acd2025ace939ce
Change-Id: I3c993a89f749f05741594ef0ea47864e17ee783b
Diffstat (limited to 'media/libstagefright/matroska/MatroskaExtractor.h')
-rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/media/libstagefright/matroska/MatroskaExtractor.h b/media/libstagefright/matroska/MatroskaExtractor.h index fa20b84..38ebd61 100644 --- a/media/libstagefright/matroska/MatroskaExtractor.h +++ b/media/libstagefright/matroska/MatroskaExtractor.h @@ -20,6 +20,7 @@ #include <media/stagefright/MediaExtractor.h> #include <utils/Vector.h> +#include <utils/threads.h> namespace mkvparser { struct Segment; @@ -45,26 +46,34 @@ struct MatroskaExtractor : public MediaExtractor { virtual sp<MetaData> getMetaData(); + virtual uint32_t flags() const; + protected: virtual ~MatroskaExtractor(); private: friend struct MatroskaSource; + friend struct BlockIterator; struct TrackInfo { unsigned long mTrackNum; sp<MetaData> mMeta; }; + + Mutex mLock; Vector<TrackInfo> mTracks; sp<DataSource> mDataSource; DataSourceReader *mReader; mkvparser::Segment *mSegment; bool mExtractedThumbnails; + bool mIsLiveStreaming; void addTracks(); void findThumbnails(); + bool isLiveStreaming() const; + MatroskaExtractor(const MatroskaExtractor &); MatroskaExtractor &operator=(const MatroskaExtractor &); }; |