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/MPEG4Extractor.cpp | |
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/MPEG4Extractor.cpp')
-rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 12a1e6e..ba90407 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1738,7 +1738,7 @@ static bool LegacySniffMPEG4( || !memcmp(header, "ftypM4A ", 8) || !memcmp(header, "ftypf4v ", 8) || !memcmp(header, "ftypkddi", 8) || !memcmp(header, "ftypM4VP", 8)) { *mimeType = MEDIA_MIMETYPE_CONTAINER_MPEG4; - *confidence = 0.1; + *confidence = 0.4; return true; } @@ -1805,13 +1805,14 @@ static bool BetterSniffMPEG4( } *mimeType = MEDIA_MIMETYPE_CONTAINER_MPEG4; - *confidence = 0.3f; + *confidence = 0.4f; return true; } bool SniffMPEG4( - const sp<DataSource> &source, String8 *mimeType, float *confidence) { + const sp<DataSource> &source, String8 *mimeType, float *confidence, + sp<AMessage> *) { if (BetterSniffMPEG4(source, mimeType, confidence)) { return true; } |