diff options
author | Lajos Molnar <lajos@google.com> | 2013-11-13 15:57:42 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 15:57:42 -0800 |
commit | ec89a75e386c61cf4ace3bc5ab80d064562ebf11 (patch) | |
tree | 122503c93c63ab47e524aa52c1fc1677ae7d2a67 /media/libstagefright/MPEG4Extractor.cpp | |
parent | 47afcc5f5fb94263977717bd12433d594fbbc43f (diff) | |
parent | 92092b395d59e8943a461d344f617f1dc85375a3 (diff) | |
download | frameworks_av-ec89a75e386c61cf4ace3bc5ab80d064562ebf11.zip frameworks_av-ec89a75e386c61cf4ace3bc5ab80d064562ebf11.tar.gz frameworks_av-ec89a75e386c61cf4ace3bc5ab80d064562ebf11.tar.bz2 |
am 92092b39: Merge "stagefright: limit default max-input-size for AVC" into klp-dev
* commit '92092b395d59e8943a461d344f617f1dc85375a3':
stagefright: limit default max-input-size for AVC
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
-rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index cbc169b..8368b39 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1370,6 +1370,9 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { return err; } + const char *mime; + CHECK(mLastTrack->meta->findCString(kKeyMIMEType, &mime)); + if (max_size != 0) { // Assume that a given buffer only contains at most 10 chunks, // each chunk originally prefixed with a 2 byte length will @@ -1379,19 +1382,27 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { } else { // No size was specified. Pick a conservatively large size. int32_t width, height; - if (mLastTrack->meta->findInt32(kKeyWidth, &width) && - mLastTrack->meta->findInt32(kKeyHeight, &height)) { - mLastTrack->meta->setInt32(kKeyMaxInputSize, width * height * 3 / 2); - } else { + if (!mLastTrack->meta->findInt32(kKeyWidth, &width) || + !mLastTrack->meta->findInt32(kKeyHeight, &height)) { ALOGE("No width or height, assuming worst case 1080p"); - mLastTrack->meta->setInt32(kKeyMaxInputSize, 3110400); + width = 1920; + height = 1080; } + + if (!strcmp(mime, MEDIA_MIMETYPE_VIDEO_AVC)) { + // AVC requires compression ratio of at least 2, and uses + // macroblocks + max_size = ((width + 15) / 16) * ((height + 15) / 16) * 192; + } else { + // For all other formats there is no minimum compression + // ratio. Use compression ratio of 1. + max_size = width * height * 3 / 2; + } + mLastTrack->meta->setInt32(kKeyMaxInputSize, max_size); } *offset += chunk_size; // Calculate average frame rate. - const char *mime; - CHECK(mLastTrack->meta->findCString(kKeyMIMEType, &mime)); if (!strncasecmp("video/", mime, 6)) { size_t nSamples = mLastTrack->sampleTable->countSamples(); int64_t durationUs; |