summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2017-10-16 14:47:31 -0700
committerMSe <mse1969@posteo.de>2018-01-10 18:20:04 +0100
commit75123a0af4b4882bba5bc7ec3872b5ad45ff58fe (patch)
tree309df1402d0314b5956de1589006abb1cc0ca558
parent540ed0a3acd4075caa4e8487885002420c420dc7 (diff)
downloadframeworks_av-75123a0af4b4882bba5bc7ec3872b5ad45ff58fe.tar.gz
frameworks_av-75123a0af4b4882bba5bc7ec3872b5ad45ff58fe.tar.bz2
frameworks_av-75123a0af4b4882bba5bc7ec3872b5ad45ff58fe.zip
stagefright: MP4Extractor: allow 10% overhead on default sample size
Bug: 64528824 Change-Id: Id19ec0d634d9337190d04abdbd97842b66502c01 CVE-2017-0855
-rwxr-xr-xmedia/libstagefright/MPEG4Extractor.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 9e37ed32c0..3ed2251bc7 100755
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1580,6 +1580,9 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
// ratio. Use compression ratio of 1.
max_size = width * height * 3 / 2;
}
+ // HACK: allow 10% overhead
+ // TODO: read sample size from traf atom for fragmented MPEG4.
+ max_size += max_size / 10;
mLastTrack->meta->setInt32(kKeyMaxInputSize, max_size);
}