From 5a1c3529e4fa2f8a11054181294e0ce79fff8dd3 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Wed, 25 Aug 2010 11:09:41 -0700 Subject: 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 --- media/libstagefright/matroska/MatroskaExtractor.cpp | 3 ++- media/libstagefright/matroska/MatroskaExtractor.h | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'media/libstagefright/matroska') 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 MatroskaExtractor::getMetaData() { } bool SniffMatroska( - const sp &source, String8 *mimeType, float *confidence) { + const sp &source, String8 *mimeType, float *confidence, + sp *) { 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 &source, String8 *mimeType, float *confidence); + const sp &source, String8 *mimeType, float *confidence, + sp *); } // namespace android -- cgit v1.1