diff options
| author | Andreas Huber <andih@google.com> | 2010-08-25 11:09:41 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-08-25 13:08:38 -0700 |
| commit | 5a1c3529e4fa2f8a11054181294e0ce79fff8dd3 (patch) | |
| tree | 06386bceb568bf27c3fff03139ac0745ec1c4eba /media/libstagefright/matroska | |
| parent | fce49325d807c278229a594c1cc866e21da0e155 (diff) | |
| download | frameworks_av-5a1c3529e4fa2f8a11054181294e0ce79fff8dd3.zip frameworks_av-5a1c3529e4fa2f8a11054181294e0ce79fff8dd3.tar.gz frameworks_av-5a1c3529e4fa2f8a11054181294e0ce79fff8dd3.tar.bz2 | |
Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
Change-Id: Icb77ae3ee95a69c7da25b4d3b8696c0a2d33028a
related-to-bug: 2948754
Diffstat (limited to 'media/libstagefright/matroska')
| -rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.cpp | 3 | ||||
| -rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp index 71f6587..7c7d69e 100644 --- a/media/libstagefright/matroska/MatroskaExtractor.cpp +++ b/media/libstagefright/matroska/MatroskaExtractor.cpp @@ -579,7 +579,8 @@ sp<MetaData> MatroskaExtractor::getMetaData() { } bool SniffMatroska( - const sp<DataSource> &source, String8 *mimeType, float *confidence) { + const sp<DataSource> &source, String8 *mimeType, float *confidence, + sp<AMessage> *) { DataSourceReader reader(source); mkvparser::EBMLHeader ebmlHeader; long long pos; diff --git a/media/libstagefright/matroska/MatroskaExtractor.h b/media/libstagefright/matroska/MatroskaExtractor.h index 7471848..fa20b84 100644 --- a/media/libstagefright/matroska/MatroskaExtractor.h +++ b/media/libstagefright/matroska/MatroskaExtractor.h @@ -27,6 +27,7 @@ struct Segment; namespace android { +struct AMessage; class String8; struct DataSourceReader; @@ -69,7 +70,8 @@ private: }; bool SniffMatroska( - const sp<DataSource> &source, String8 *mimeType, float *confidence); + const sp<DataSource> &source, String8 *mimeType, float *confidence, + sp<AMessage> *); } // namespace android |