summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MPEG4Extractor.cpp
Commit message (Collapse)AuthorAgeFilesLines
* MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as ↵Wei Jia2016-05-271-0/+8
| | | | | | | | | | | | | | | track. GenericSource: return error when no track exists. SampleIterator: make sure mSamplesPerChunk is not zero before using it as divisor. Bug: 21657957 Bug: 23705695 Bug: 22802344 Bug: 28799341 Change-Id: I7664992ade90b935d3f255dcd43ecc2898f30b04 (cherry picked from commit 0386c91b8a910a134e5898ffa924c1b6c7560b13)
* Check malloc result to avoid NPDMarco Nelissen2016-05-271-0/+18
| | | | | Bug: 28471206 Change-Id: Id5d055d76893d6f53a2e524ff5f282d1ddca3345
* Also fix out of bounds access for normal readMarco Nelissen2016-02-261-1/+9
| | | | | | | Previous fix accidentally only fixed the fragmented read case. Bug: 27208621 Change-Id: Ie16f1920b84c8aba613842659238fcd5925694ad
* Fix out-of-bounds writeMarco Nelissen2016-01-221-1/+9
| | | | | Bug: 26365349 Change-Id: Ia363d9f8c231cf255dea852e0bbf5ca466c7990b
* Fix offset adjustment when skipping off-spec meta chunkMarco Nelissen2015-10-221-3/+3
| | | | | Bug: 25172843 Change-Id: Ibbfe4369176f2a367eab5a39fd742f425b017288
* am f1790258: am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am ↵Marco Nelissen2015-10-061-2/+9
|\ | | | | | | | | | | | | 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev * commit 'f1790258494751adc629126666e7dd81bbc8afbd': Check NAL size before use
| * am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82: am ↵Marco Nelissen2015-10-061-2/+9
| |\ | | | | | | | | | | | | | | | | | | 74d1927e: Merge "Check NAL size before use" into klp-dev * commit '5e92fdede2391b77cff5fe914d748e1023d0ef90': Check NAL size before use
| | * am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size ↵Marco Nelissen2015-10-061-2/+9
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | before use" into klp-dev * commit 'f2cf2bd7448734c6881e3bea2b758f2bf9feeed9': Check NAL size before use
| | | * am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '00f5fa82d884c0ca41ee08e7a67ab54238109083': Check NAL size before use
| | | | * am 74d1927e: Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '74d1927e4122a1748f89ca2ef79406fc06ee94b2': Check NAL size before use
| | | | | * Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | | |\
| | | | | | * Check NAL size before useMarco Nelissen2015-10-061-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24441553 Bug: 24445122 Change-Id: Ib7f025769adbafd5a2cb64fae5562a0a565945c2
| * | | | | | am 3674abc0: am fb0d63df: am 62d89908: am df68d9d5: am 60b25aa0: am ↵Wei Jia2015-10-061-0/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev * commit '3674abc050997e664c3906b8507d9d4b63d52e9d': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
| | * | | | | am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ↵Wei Jia2015-10-061-0/+6
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ensure buffer size is not less than 8 for LastCommentData." into klp-dev * commit '62d89908f6c7e3da9dac36aa439ceb1c2522b86d': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
| | | * | | | am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not ↵Wei Jia2015-10-061-0/+6
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | less than 8 for LastCommentData." into klp-dev * commit '60b25aa0c173854593743dd85588c7449baf87c0': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
| | | | * | | am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 ↵Wei Jia2015-10-061-0/+6
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for LastCommentData." into klp-dev * commit '9ab9c85e39f089f355faa9cd9db6d113dc482e61': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
| | | | | * | MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.Wei Jia2015-10-061-0/+6
| | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24346430 Change-Id: I897a724e968841d9160f819d06c0ce22f6d743c4 (cherry picked from commit 5cae16bdce77b0a3ba590b55637f7d55a2f35402)
| * | | | | am 2c02f5ee: am 719cd33e: am 492bba08: am d18bb120: am 09f71c56: am ↵Marco Nelissen2015-08-241-4/+12
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dedaca6f: Limit allocations to avoid out-of-memory * commit '2c02f5eeec639825ece4acbca0d1969da192dca0': Limit allocations to avoid out-of-memory
| | * | | | am 492bba08: am d18bb120: am 09f71c56: am dedaca6f: Limit allocations to ↵Marco Nelissen2015-08-231-4/+12
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoid out-of-memory * commit '492bba08202a601e96a13b26422c85b3fb1a5ee0': Limit allocations to avoid out-of-memory
| | | * | | am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-231-4/+12
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | * commit '09f71c5621799e0f030b4a8058d2fb4df5977de0': Limit allocations to avoid out-of-memory
| | | | * | am dedaca6f: Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-231-4/+12
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | | | | | | | * commit 'dedaca6f04ac9f95fabe3b64d44cd1a2050f079e': Limit allocations to avoid out-of-memory
| | | | | * Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-211-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrupt files could cause very large allocations, limit them to something more reasonable. Bug: 17769851 Change-Id: Ib0f722fd6fddff873bd7a547aac456e608c34c84
| | | | * | resolved conflicts for merge of 8a064aa8 to klp-modular-devMarco Nelissen2015-08-201-7/+19
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | Change-Id: If031955c9edca657401831fbfa5a128f0b4c6d86
| | | | | * Merge "Fail more gracefully on allocation failure" into klp-devMarco Nelissen2015-08-201-7/+20
| | | | | |\
| | | | | | * Fail more gracefully on allocation failureMarco Nelissen2015-08-191-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check allocations when the size is read from a file and might therefore be invalid. b/14388161 Change-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0
* | | | | | | MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.Wei Jia2015-10-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24346430 Change-Id: I897a724e968841d9160f819d06c0ce22f6d743c4
* | | | | | | stagefright: MPEG4Extractor: allow 'hdlr' box before first trackLajos Molnar2015-08-311-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21725583 Change-Id: I799c1967759c7e49fb50281a1708188450caac77
* | | | | | | am f8f0e0b7: am 562be234: am f076fabf: am 0af43510: am 2562495d: am ↵Wei Jia2015-08-201-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a590baca: Merge commit \'6ae815e0\' into HEAD * commit 'f8f0e0b756b0f96eccc94af89a0087c146232b26': libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
| * | | | | | am 562be234: am f076fabf: am 0af43510: am 2562495d: am a590baca: Merge ↵Wei Jia2015-08-201-1/+19
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit \'6ae815e0\' into HEAD * commit '562be234743f7d82f8ee45cf0258e9db8239a817': libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
| | * | | | | am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEADWei Jia2015-08-201-1/+19
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '0af43510cc45373614cdfce7d014283100e96cb9': libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
| | | * | | | am a590baca: Merge commit \'6ae815e0\' into HEADWei Jia2015-08-201-1/+19
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | * commit 'a590baca031199327f6382347625dd232de2c95c': libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
| | | | * | | Merge commit '6ae815e0' into HEADWei Jia2015-08-201-1/+19
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets. Bug: 23270724 (cherry picked from commit c51ab7dd82bf4e24666fc72a55e03e2f530204d5) Change-Id: I44c642548ee6ba3745fb1f46d8645bece231035a
| | | | | * | libstagefright: fix overflow in ↵Wei Jia2015-08-201-1/+19
| | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPEG4Source::parseSampleAuxiliaryInformationOffsets. Bug: 23270724 Change-Id: Id7ba55c7bf6860fbfc892bbb6378aac644c82da4 (cherry picked from commit c51ab7dd82bf4e24666fc72a55e03e2f530204d5)
| * | | | | am a598bac2: am a3a29952: am 4b153ff9: am 2f3c04a4: resolved conflicts for ↵Nick Kralevich2015-08-201-8/+40
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge of 6035c811 to lmp-dev * commit 'a598bac211012fa1b4bd603f47755781ffb2e38c': MPEG4Source::fragmentedRead: check range before writing into buffers
| | * | | | am 4b153ff9: am 2f3c04a4: resolved conflicts for merge of 6035c811 to lmp-devNick Kralevich2015-08-181-8/+40
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '4b153ff9b5c979684ed0a53d52a3ad90ec7f7d22': MPEG4Source::fragmentedRead: check range before writing into buffers
| | | * | | resolved conflicts for merge of 6035c811 to lmp-devNick Kralevich2015-08-181-8/+40
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | Change-Id: Icf911f31e207c4c658047f6bfe8088d697b04ed6
| | | | * | am 0d46c937: Merge "MPEG4Source::fragmentedRead: check range before writing ↵Jon Larimer2015-08-181-8/+40
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into buffers" into klp-dev * commit '0d46c93785e2c426be11172bec0489b698fea6c3': MPEG4Source::fragmentedRead: check range before writing into buffers
| | | | | * Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" ↵Jon Larimer2015-08-181-8/+40
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | into klp-dev
| | | | | | * MPEG4Source::fragmentedRead: check range before writing into buffersRobert Shih2015-08-171-8/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22008959 Change-Id: I5f6e188adcc593796455bdaf7b0b8aba672b106e
| * | | | | | am ccf0e448: am 6f0b1b3e: am 484ebc81: am a1e462e5: am 0afecdeb: am ↵Jon Larimer2015-08-201-0/+8
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa1cc741: Merge "Check buffer size before using it" into klp-dev * commit 'ccf0e44889f1d4cf5707081556a8b7b62707d62d': Check buffer size before using it
| | * | | | | am 484ebc81: am a1e462e5: am 0afecdeb: am aa1cc741: Merge "Check buffer size ↵Jon Larimer2015-08-181-0/+8
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before using it" into klp-dev * commit '484ebc81263a627b5e24e65373ab0752996ca0c8': Check buffer size before using it
| | | * | | | am 0afecdeb: am aa1cc741: Merge "Check buffer size before using it" into klp-devJon Larimer2015-08-181-0/+8
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | * commit '0afecdebaea1982ead120a701ddd24f2b0ff3897': Check buffer size before using it
| | | | * | | am aa1cc741: Merge "Check buffer size before using it" into klp-devJon Larimer2015-08-181-0/+8
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | * commit 'aa1cc74139341eb3ae9511af5310b965dbf890f4': Check buffer size before using it
| | | | | * | Merge "Check buffer size before using it" into klp-devJon Larimer2015-08-181-0/+8
| | | | | |\ \
| | | | | | * | Check buffer size before using itMarco Nelissen2015-08-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21814993 Change-Id: Idaac61b4b9f4058b94e84093644593ba315d72ff (cherry picked from commit c1a104aaad2d84a57bf5d87dd030d2bef56bf541)
| * | | | | | | am 527ad688: am 8a83ce9c: am 54ea6c02: am 5ff4bb7a: am 8026ad38: am ↵Abhishek Arya2015-08-201-0/+9
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6efa86be: Merge "Check vector size before accessing" into klp-dev * commit '527ad688e8d1e89d903351c5fbf39514da52adbe': Check vector size before accessing
| | * | | | | | am 54ea6c02: am 5ff4bb7a: am 8026ad38: am 6efa86be: Merge "Check vector size ↵Abhishek Arya2015-08-181-0/+9
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before accessing" into klp-dev * commit '54ea6c02570ca87e94b03e0a8468dfc2f20536b7': Check vector size before accessing
| | | * | | | | am 8026ad38: am 6efa86be: Merge "Check vector size before accessing" into ↵Abhishek Arya2015-08-181-0/+9
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '8026ad3838e2f7367e8ff616f66b2c2f8bc8488c': Check vector size before accessing
| | | | * | | | am 6efa86be: Merge "Check vector size before accessing" into klp-devAbhishek Arya2015-08-181-0/+9
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '6efa86beff54332cbf7bbd4949b0c38c1ec8c5cd': Check vector size before accessing
| | | | | * | | Merge "Check vector size before accessing" into klp-devAbhishek Arya2015-08-181-0/+9
| | | | | |\ \ \
generated by cgit v1.1 at 2024-05-21 23:03:53 +0000