From 0bde89c1fe6e1da826279a219e6669d63baeb416 Mon Sep 17 00:00:00 2001 From: Matt Woodrow Date: Fri, 28 Nov 2014 13:18:35 +1300 Subject: [PATCH] Bug 1102647 - Accept 4k video sizes in MPEG4Extractor. r=ajones --- .../frameworks/av/media/libstagefright/MPEG4Extractor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp index 59613391300..4564ea34a20 100644 --- a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp @@ -2503,7 +2503,7 @@ static bool ValidInputSize(int32_t size) { // Reject compressed samples larger than an uncompressed UHD // frame. This is a reasonable cut-off for a lossy codec, // combined with the current Firefox limit to 5k video. - return (size > 0 && size < 4 * (1920 * 1080) * 3 / 2); + return (size > 0 && size <= 4 * (1920 * 1080) * 3 / 2); } status_t MPEG4Source::start(MetaData *params) {