diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-06-06 05:58:33 +0100 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2015-04-09 21:12:52 +0000 |
| commit | f200b25fb1f9b407b670b651fd5e3f2d69cd7a30 (patch) | |
| tree | 4599e6e382e4d2f086871c828309ba01dcb7fd50 | |
| parent | 4a050b7d543d802ffe3aaaf3a604defa1e98f17b (diff) | |
| download | frameworks_av-stable/cm-12.0-YNG1TA.tar.gz frameworks_av-stable/cm-12.0-YNG1TA.tar.bz2 frameworks_av-stable/cm-12.0-YNG1TA.zip | |
MediaExtractor: Add more skip conditions for the second-pass extractorsstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1T
If the stream's container is opaque (DRM) or a known skip condition
(cached-source MPEG4), don't push it through the deep scanner
Change-Id: Ia9d60180b5d177714d206fc7dc94da93b37a048e
(cherry picked from commit 059c0a72ea250e7e326c5a50536b48311ac6cc9a)
| -rwxr-xr-x | media/libstagefright/MediaExtractor.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp index e3837c2452..5af9c08541 100755 --- a/media/libstagefright/MediaExtractor.cpp +++ b/media/libstagefright/MediaExtractor.cpp @@ -149,7 +149,9 @@ retry: if (ret != NULL) { - if (!secondPass && ( ret->countTracks() == 0 || + if (!(!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG4) && + (source->flags() & DataSource::kIsCachingDataSource)) && + !isDrm && !secondPass && ( ret->countTracks() == 0 || (!strncasecmp("video/", mime, 6) && ret->countTracks() < 2) ) ) { secondPass = true; goto retry; |