summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MPEG4Extractor.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | * | 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
* | | | | | | | stagefright: Support MP3 in MPEG4 containersSteve Kondik2015-10-281-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8e13a68cc10fafc43dd8f7d350644c7638d5d5e3
* | | | | | | | Stagefright: Add Checks for allocationsSathishKumar Mani2015-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warn allocation failures explicitly rather than crash trying to access unallocated memory Change-Id: Ie86c3ac130917e1f4030eb8207ac8350cba7711d
* | | | | | | | libstagefright - Fix seek on audio having empty stss blockRamjee Singh2015-10-061-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore stss block for audio even if its present, all audio sample are sync samples itself, self decodeable and playable. Parsing this block for audio restricts audio seek to few entries available in this block, sometimes 0, which is undesired. CRs-Fixed: 664870 Change-Id: I7f8e140aa27e8107a438f6bf4c21a3148c80680f
* | | | | | | | libstagefright - Fix seek on audio having empty stss blockYamit Mehta2015-10-061-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore stss block for audio even if its present, all audio sample are sync samples itself, self decodeable and playable. Parsing this block for audio restricts audio seek to few entries available in this block, sometimes 0, which is undesired. CRs-Fixed: 664870 Change-Id: If3208d5c0557d3eaeddf875d6c6762bd870c439b
* | | | | | | | libstagefright: Add check for bits avail to readYamit Mehta2015-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If number of bits available to read from ABitReader is zero,do not call getBits. Change-Id: I4b7332b03ed6ee1d7b6711e5b4c5dce396151b03 CRs-Fixed: 777657
* | | | | | | | stagefright: MPEG4Extractor: allow 'hdlr' box before first trackLajos Molnar2015-09-021-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
| | | | | |\ \ \
| | | | | | * | | Check vector size before accessingMarco Nelissen2015-08-151-0/+9
| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22388975 Change-Id: I3c157b1029d37f6a22e6302ea7b52077fe27ce53 (cherry picked from commit 529c595b083f8a4c3175e2350fba5547e6008e00)
| * | | | | | | am 4f0ff02b: am 46f7acbb: am 3175ff3f: am 90eee339: am 652926c8: am ↵Wei Jia2015-08-201-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74d3170f: Merge "Fix comparison sign warnings." into klp-dev * commit '4f0ff02b159892bfa5d3d298efc165e96f93288b': Fix comparison sign warnings.
| | * | | | | | am 3175ff3f: am 90eee339: am 652926c8: am 74d3170f: Merge "Fix comparison ↵Wei Jia2015-08-181-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sign warnings." into klp-dev * commit '3175ff3f343ecd85700e2029d7709ce960272967': Fix comparison sign warnings.
| | | * | | | | am 652926c8: am 74d3170f: Merge "Fix comparison sign warnings." into klp-devWei Jia2015-08-181-1/+1
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '652926c8a37fb904aaa0756a0d0bae0574f308c5': Fix comparison sign warnings.
| | | | * | | | am 74d3170f: Merge "Fix comparison sign warnings." into klp-devWei Jia2015-08-181-1/+1
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '74d3170ffc02620fcedb5a98c7a66e83ee2faa87': Fix comparison sign warnings.
| | | | | * | | Fix comparison sign warnings.Dan Albert2015-08-151-1/+1
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:23213430 Change-Id: I6f2e2b03b968a569b122004b4803c5d17fccfb12 (cherry picked from commit 635bc8f90429b2fdcaf7f8d43f7f59bcd0fe951c)
| | | | * | | resolved conflicts for merge of c86eae32 to klp-modular-devNick Kralevich2015-08-101-1/+1
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | Change-Id: I127912aed9c9e57a985c46bee13d111e159d2c6f
| | | | | * | am 9d9491f9: am 0dbd0d7b: am c9924410: am 2fe61ed0: am 3b8d3fa0: am ↵Nick Kralevich2015-08-111-1/+1
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev * commit '9d9491f9fb83523cfe68f2aa26c14f72f70812fc': MPEG4Extractor.cpp: Add check for size == SIZE_MAX
| | | | | | * \ am c9924410: am 2fe61ed0: am 3b8d3fa0: am 186d1fb9: am f4dfe12e: am ↵Nick Kralevich2015-08-111-1/+1
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54d88fe2: am aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev * commit 'c99244105803ac32f4cc698b5b2a85b225d925a2': MPEG4Extractor.cpp: Add check for size == SIZE_MAX
| | | | | | | * \ am 2fe61ed0: am 3b8d3fa0: am 186d1fb9: am f4dfe12e: am 54d88fe2: am ↵Nick Kralevich2015-08-111-1/+1
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev * commit '2fe61ed032e083dc39265f3b88274fcb8fbeed9b': MPEG4Extractor.cpp: Add check for size == SIZE_MAX
| | | | | | | | * \ am 54d88fe2: am aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == ↵Nick Kralevich2015-08-111-1/+1
| | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SIZE_MAX" into jb-dev * commit '54d88fe2f17b1c5c6e4d0d1d1e36089fea3a1df0': MPEG4Extractor.cpp: Add check for size == SIZE_MAX
| | | | | | | | | * \ Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-devNick Kralevich2015-08-081-1/+1
| | | | | | | | | |\ \
| | | | | | | | | | * | MPEG4Extractor.cpp: Add check for size == SIZE_MAXNick Kralevich2015-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If size == SIZE_MAX, the line: uint8_t *buffer = new (std::nothrow) uint8_t[size + 1]; ends up allocating zero bytes, which is obviously incorrect. This is conceptually a cherrypick of commit b2d33aee5122c91a59c2a676c0b89ad340232450 , but specifically for Android 4.1 through Android 4.4. In Android 5.0, new code was introduced which caused the function parseMetaData() to be renamed. Bug: 23031033 Change-Id: Ib34e740f3292a484f8a24e513c1cce58f2f33ecb
* | | | | | | | | | | | libstagefright: fix overflow in ↵Wei Jia2015-08-191-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPEG4Source::parseSampleAuxiliaryInformationOffsets. Bug: 23270724 Change-Id: Id7ba55c7bf6860fbfc892bbb6378aac644c82da4
* | | | | | | | | | | | am 5aa85d05: am 74cda34a: am 41d93c2f: am c88ddfc0: am 2abbc048: am ↵Nick Kralevich2015-08-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX * commit '5aa85d05aaeb5509597b7876942b6f5e543a451c': MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
| * | | | | | | | | | | am 74cda34a: am 41d93c2f: am c88ddfc0: am 2abbc048: am ba34c2ba: am ↵Nick Kralevich2015-08-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX * commit '74cda34ac909eb713cec22bebb08ecaeefd8f7dd': MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
generated by cgit v1.1 at 2024-05-20 19:23:46 +0000