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/include/MPEG4Extractor.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/include/MPEG4Extractor.h')
| -rw-r--r-- | media/libstagefright/include/MPEG4Extractor.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/media/libstagefright/include/MPEG4Extractor.h b/media/libstagefright/include/MPEG4Extractor.h index 7b4bc6d..1fe6fcf 100644 --- a/media/libstagefright/include/MPEG4Extractor.h +++ b/media/libstagefright/include/MPEG4Extractor.h @@ -39,6 +39,14 @@ struct SidxEntry { uint32_t mDurationUs; }; +struct Trex { + uint32_t track_ID; + uint32_t default_sample_description_index; + uint32_t default_sample_duration; + uint32_t default_sample_size; + uint32_t default_sample_flags; +}; + class MPEG4Extractor : public MediaExtractor { public: // Extractor assumes ownership of "source". @@ -74,11 +82,12 @@ private: }; Vector<SidxEntry> mSidxEntries; - uint64_t mSidxDuration; off64_t mMoofOffset; Vector<PsshInfo> mPssh; + Vector<Trex> mTrex; + sp<DataSource> mDataSource; status_t mInitCheck; bool mHasVideo; |