diff options
| author | Marco Nelissen <marcone@google.com> | 2013-04-08 14:30:57 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2013-04-08 16:34:27 -0700 |
| commit | 5544c66ba0aa789a997b376df503a5ffae425dc7 (patch) | |
| tree | 1340a1e933a94542bf1a35ce3c8f667616234bca /media/libstagefright/include | |
| parent | 4d2f2e8414df33337d4f09e5235719dfcc705674 (diff) | |
| download | frameworks_av-5544c66ba0aa789a997b376df503a5ffae425dc7.zip frameworks_av-5544c66ba0aa789a997b376df503a5ffae425dc7.tar.gz frameworks_av-5544c66ba0aa789a997b376df503a5ffae425dc7.tar.bz2 | |
Add support for common encryption
b/7465749
Change-Id: I5403b74a5ae428ad28b382863a09daafc400b137
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/MPEG4Extractor.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/include/MPEG4Extractor.h b/media/libstagefright/include/MPEG4Extractor.h index c68623a..35eff96 100644 --- a/media/libstagefright/include/MPEG4Extractor.h +++ b/media/libstagefright/include/MPEG4Extractor.h @@ -59,6 +59,11 @@ protected: private: + struct PsshInfo { + uint8_t uuid[16]; + uint32_t datalen; + uint8_t *data; + }; struct Track { Track *next; sp<MetaData> meta; @@ -72,6 +77,8 @@ private: uint64_t mSidxDuration; off64_t mMoofOffset; + Vector<PsshInfo> mPssh; + sp<DataSource> mDataSource; status_t mInitCheck; bool mHasVideo; |