diff options
Diffstat (limited to 'media/libstagefright/MediaExtractor.cpp')
-rw-r--r-- | media/libstagefright/MediaExtractor.cpp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp index fc96e2f..ef0524a 100644 --- a/media/libstagefright/MediaExtractor.cpp +++ b/media/libstagefright/MediaExtractor.cpp @@ -60,15 +60,9 @@ sp<MediaExtractor> MediaExtractor::Create( const uint32_t flags) { sp<AMessage> meta; - bool secondPass = false; - String8 tmp; -retry: - if (secondPass || mime == NULL) { + if (mime == NULL) { float confidence; - if (secondPass) { - confidence = 3.14f; - } if (!source->sniff(&tmp, &confidence, &meta)) { ALOGV("FAILED to autodetect media content."); @@ -102,9 +96,10 @@ retry: } } - sp<MediaExtractor> ret = NULL; + sp<MediaExtractor> ret; AString extractorName; if ((ret = AVFactory::get()->createExtendedExtractor(source, mime, meta, flags)) != NULL) { + ALOGI("Using extended extractor"); } else if (meta.get() && meta->findString("extended-extractor-use", &extractorName) && sPlugin.create) { ALOGI("Use extended extractor for the special mime(%s) or codec", mime); @@ -149,15 +144,6 @@ retry: } } - if (ret != NULL) { - - if (!secondPass && ( ret->countTracks() == 0 || - (!strncasecmp("video/", mime, 6) && ret->countTracks() < 2) ) ) { - secondPass = true; - goto retry; - } - } - return ret; } |