summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MPEG4Extractor.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-08-17 13:03:51 -0700
committerAndreas Huber <andih@google.com>2011-08-17 13:03:51 -0700
commit169c286ed166499c5099d2b336967e0bf3d25551 (patch)
tree762830447cdb8540b297da53fd76d709d899b4b8 /media/libstagefright/MPEG4Extractor.cpp
parent8a976a863cf921f97feff8be63f11775a1d8b76f (diff)
downloadframeworks_av-169c286ed166499c5099d2b336967e0bf3d25551.zip
frameworks_av-169c286ed166499c5099d2b336967e0bf3d25551.tar.gz
frameworks_av-169c286ed166499c5099d2b336967e0bf3d25551.tar.bz2
Make sure we have all the sample table metadata before declaring a track valid.
Change-Id: I2dfbc3e6017b5cd264e4cccfa47d19047b2e7f31 related-to-bug: 5178976
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
-rw-r--r--media/libstagefright/MPEG4Extractor.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 73a05a5..3b79f06 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1687,6 +1687,11 @@ status_t MPEG4Extractor::verifyTrack(Track *track) {
}
}
+ if (!track->sampleTable->isValid()) {
+ // Make sure we have all the metadata we need.
+ return ERROR_MALFORMED;
+ }
+
return OK;
}