diff options
author | Marco Nelissen <marcone@google.com> | 2012-08-28 15:09:49 -0700 |
---|---|---|
committer | Marco Nelissen <marcone@google.com> | 2012-09-05 14:22:07 -0700 |
commit | 56997121c5031598fbbba7b7c53980b7fd529c2d (patch) | |
tree | 14e4e9aecfe88d071fce9255dc6be21f8b4c4a0c /media/libstagefright/include | |
parent | 6c75ad21705cde0a11f78c755dc70bdec76890e6 (diff) | |
download | frameworks_av-56997121c5031598fbbba7b7c53980b7fd529c2d.zip frameworks_av-56997121c5031598fbbba7b7c53980b7fd529c2d.tar.gz frameworks_av-56997121c5031598fbbba7b7c53980b7fd529c2d.tar.bz2 |
Fragmented mp4 extractor
Still experimental. Set property "media.stagefright.use-fragmp4" to true to
enable.
Change-Id: I210b9c5b5164b5c5eefc31309845ee881ac7db8e
Diffstat (limited to 'media/libstagefright/include')
-rw-r--r-- | media/libstagefright/include/FragmentedMP4Extractor.h | 70 | ||||
-rw-r--r-- | media/libstagefright/include/FragmentedMP4Parser.h | 23 |
2 files changed, 91 insertions, 2 deletions
diff --git a/media/libstagefright/include/FragmentedMP4Extractor.h b/media/libstagefright/include/FragmentedMP4Extractor.h new file mode 100644 index 0000000..763cd3a --- /dev/null +++ b/media/libstagefright/include/FragmentedMP4Extractor.h @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef FRAGMENTED_MP4_EXTRACTOR_H_ + +#define FRAGMENTED_MP4_EXTRACTOR_H_ + +#include "include/FragmentedMP4Parser.h" + +#include <media/stagefright/MediaExtractor.h> +#include <utils/Vector.h> +#include <utils/String8.h> + +namespace android { + +struct AMessage; +class DataSource; +class SampleTable; +class String8; + +class FragmentedMP4Extractor : public MediaExtractor { +public: + // Extractor assumes ownership of "source". + FragmentedMP4Extractor(const sp<DataSource> &source); + + virtual size_t countTracks(); + virtual sp<MediaSource> getTrack(size_t index); + virtual sp<MetaData> getTrackMetaData(size_t index, uint32_t flags); + virtual sp<MetaData> getMetaData(); + virtual uint32_t flags() const; + +protected: + virtual ~FragmentedMP4Extractor(); + +private: + sp<ALooper> mLooper; + sp<FragmentedMP4Parser> mParser; + sp<DataSource> mDataSource; + status_t mInitCheck; + size_t mAudioTrackIndex; + size_t mTrackCount; + + sp<MetaData> mFileMetaData; + + Vector<uint32_t> mPath; + + FragmentedMP4Extractor(const FragmentedMP4Extractor &); + FragmentedMP4Extractor &operator=(const FragmentedMP4Extractor &); +}; + +bool SniffFragmentedMP4( + const sp<DataSource> &source, String8 *mimeType, float *confidence, + sp<AMessage> *); + +} // namespace android + +#endif // MPEG4_EXTRACTOR_H_ diff --git a/media/libstagefright/include/FragmentedMP4Parser.h b/media/libstagefright/include/FragmentedMP4Parser.h index bd8fe32..0edafb9 100644 --- a/media/libstagefright/include/FragmentedMP4Parser.h +++ b/media/libstagefright/include/FragmentedMP4Parser.h @@ -19,6 +19,7 @@ #define PARSER_H_ #include <media/stagefright/foundation/AHandler.h> +#include <media/stagefright/DataSource.h> #include <utils/Vector.h> namespace android { @@ -30,6 +31,7 @@ struct FragmentedMP4Parser : public AHandler { Source() {} virtual ssize_t readAt(off64_t offset, void *data, size_t size) = 0; + virtual bool isSeekable() = 0; protected: virtual ~Source() {} @@ -42,9 +44,12 @@ struct FragmentedMP4Parser : public AHandler { void start(const char *filename); void start(const sp<Source> &source); + void start(sp<DataSource> &source); - sp<AMessage> getFormat(bool audio); - status_t dequeueAccessUnit(bool audio, sp<ABuffer> *accessUnit); + sp<AMessage> getFormat(bool audio, bool synchronous = false); + status_t dequeueAccessUnit(bool audio, sp<ABuffer> *accessUnit, bool synchronous = false); + status_t seekTo(bool audio, int64_t timeUs); + bool isSeekable() const; virtual void onMessageReceived(const sp<AMessage> &msg); @@ -58,6 +63,7 @@ private: kWhatReadMore, kWhatGetFormat, kWhatDequeueAccessUnit, + kWhatSeekTo, }; struct TrackFragment; @@ -97,6 +103,11 @@ private: off64_t mOffset; }; + struct SidxEntry { + size_t mSize; + uint32_t mDurationUs; + }; + struct TrackInfo { enum Flags { kTrackEnabled = 0x01, @@ -107,6 +118,7 @@ private: uint32_t mTrackID; uint32_t mFlags; uint32_t mDuration; // This is the duration in terms of movie timescale! + uint64_t mSidxDuration; // usec, from sidx box, which can use a different timescale uint32_t mMediaTimeScale; @@ -121,6 +133,7 @@ private: uint32_t mDecodingTime; + Vector<SidxEntry> mSidx; sp<StaticTrackFragment> mStaticFragment; List<sp<TrackFragment> > mFragments; }; @@ -151,6 +164,8 @@ private: sp<Source> mSource; off_t mBufferPos; bool mSuspended; + bool mDoneWithMoov; + off_t mFirstMoofOffset; // used as the starting point for offsets calculated from the sidx box sp<ABuffer> mBuffer; Vector<Container> mStack; KeyedVector<uint32_t, TrackInfo> mTracks; // TrackInfo by trackID @@ -164,6 +179,7 @@ private: status_t onProceed(); status_t onDequeueAccessUnit(size_t trackIndex, sp<ABuffer> *accessUnit); + status_t onSeekTo(bool wantAudio, int64_t position); void enter(off64_t offset, uint32_t type, uint64_t size); @@ -222,6 +238,9 @@ private: status_t parseMediaData( uint32_t type, size_t offset, uint64_t size); + status_t parseSegmentIndex( + uint32_t type, size_t offset, uint64_t size); + TrackInfo *editTrack(uint32_t trackID, bool createIfNecessary = false); ssize_t findTrack(bool wantAudio) const; |