summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-09-12 13:49:00 -0700
committerAndreas Huber <andih@google.com>2011-09-12 13:49:00 -0700
commitc6c4572cd35f739bfac2aa439b3664032e03dcd8 (patch)
treed9148324e4afde473c7986a14b8f8ef0ae1b4af4 /media
parentfb6f03425a791dcc4188462c860becf6ca6be4ea (diff)
downloadframeworks_av-c6c4572cd35f739bfac2aa439b3664032e03dcd8.zip
frameworks_av-c6c4572cd35f739bfac2aa439b3664032e03dcd8.tar.gz
frameworks_av-c6c4572cd35f739bfac2aa439b3664032e03dcd8.tar.bz2
Increase the avi extractor's confidence slighly over mp3's
So that we don't accidentally identify a .avi file containing an mp3 track as an mp3 file. Change-Id: I73495b80cbb5bc1007bf810f2db453c9f175171b related-to-bug: 5288189
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/AVIExtractor.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/media/libstagefright/AVIExtractor.cpp b/media/libstagefright/AVIExtractor.cpp
index 6313ca3..62d17da 100644
--- a/media/libstagefright/AVIExtractor.cpp
+++ b/media/libstagefright/AVIExtractor.cpp
@@ -911,7 +911,11 @@ bool SniffAVI(
if (!memcmp(tmp, "RIFF", 4) && !memcmp(&tmp[8], "AVI ", 4)) {
mimeType->setTo(MEDIA_MIMETYPE_CONTAINER_AVI);
- *confidence = 0.2;
+
+ // Just a tad over the mp3 extractor's confidence, since
+ // these .avi files may contain .mp3 content that otherwise would
+ // mistakenly lead to us identifying the entire file as a .mp3 file.
+ *confidence = 0.21;
return true;
}