summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | * | | am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhereJeff Tinker2015-08-211-3/+3
| | | | | |\ \ \ | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c2153d0dc800d0718788dccd0f2a2d29f4647c03': DO NOT MERGE Part of fix for libmedia OOB write anywhere
| | | | | | * | DO NOT MERGE Part of fix for libmedia OOB write anywhereJeff Tinker2015-08-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that decrypt destination is not a pointer for secure case. b/23223325 Change-Id: I642dcf790a9eb9e32175f3e0d8f040c82228e3ac (cherry picked from commit ed555d70d80964f40563d89a4e6d6a80f83f4b89)
| | | | | * | | 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
| | | | | * | | | am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and ↵Wei Jia2015-08-201-1/+13
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mNumSampleSizes in SampleTable." into klp-dev * commit '522019f15b3c191b73d1a0ddb56aeb3dd6b7ce31': libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
| | | | | | * | | Merge "libstagefright: fix handling of mSampleTimeEntries and ↵Wei Jia2015-08-201-1/+13
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mNumSampleSizes in SampleTable." into klp-dev
| | | | | | | * | | libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in ↵Wei Jia2015-08-191-1/+13
| | | | | | | | |/ | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SampleTable. Bug: 23247055 Change-Id: I29ef59c7ff09248063714e5013f7c33f66c5eebd (cherry picked from commit 3564c4562f46bede6ef1ea716c4fd4f77e470ae8)
| * | | | | | | | am 0ea1da27: am 5f126c0d: am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part ↵Abhishek Arya2015-08-211-3/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of fix for libmedia OOB write anywhere" into lmp-dev * commit '0ea1da27437575f6b075860fa858a257c806d5ef': DO NOT MERGE Part of fix for libmedia OOB write anywhere
| | * | | | | | | am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB ↵Abhishek Arya2015-08-211-3/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write anywhere" into lmp-dev * commit 'e93a33a8f2706d3918634d17c33491f69060a62c': DO NOT MERGE Part of fix for libmedia OOB write anywhere
| | | * | | | | | am 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB write ↵Abhishek Arya2015-08-211-3/+3
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anywhere" into lmp-dev * commit '8cc71bc8f32ba85fc7e2b9dac0d7450147a4f3db': DO NOT MERGE Part of fix for libmedia OOB write anywhere
| | | | * | | | | DO NOT MERGE Part of fix for libmedia OOB write anywhereJeff Tinker2015-08-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that decrypt destination is not a pointer for secure case. b/23223325 Change-Id: I642dcf790a9eb9e32175f3e0d8f040c82228e3ac (cherry picked from commit ed555d70d80964f40563d89a4e6d6a80f83f4b89)
| * | | | | | | | am 35fbcdd6: am 3d97de8c: am b8a84e59: am ef87594b: Merge "libstagefright: ↵Nick Kralevich2015-08-201-22/+66
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix crash in convertMetaDataToMessage" into lmp-dev * commit '35fbcdd63b3961e98797a738c138698a8bcf4258': libstagefright: Fix crash in convertMetaDataToMessage
| | * | | | | | | am b8a84e59: am ef87594b: Merge "libstagefright: Fix crash in ↵Nick Kralevich2015-08-201-22/+66
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | convertMetaDataToMessage" into lmp-dev * commit 'b8a84e59ed3724a2e220dbda49dc5478334e9bad': libstagefright: Fix crash in convertMetaDataToMessage
| | | * | | | | | am ef87594b: Merge "libstagefright: Fix crash in convertMetaDataToMessage" ↵Nick Kralevich2015-08-201-22/+66
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'ef87594bd821520cdc46e30036c16ee2eb5becb3': libstagefright: Fix crash in convertMetaDataToMessage
| | | | * | | | | Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-devNick Kralevich2015-08-201-22/+66
| | | | |\ \ \ \ \
| | | | | * | | | | libstagefright: Fix crash in convertMetaDataToMessageWei Jia2015-08-191-22/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The ABuffer used for the Message has a preset value of 1024, if flattening the meta data exceeds this value, a check fails hence the crash. - This change creates a new ABuffer if the buffer size would exceed the buffer capacity. Bug: 22771132 CRs-Fixed: 857850 (cherry picked from commit 9c170c076382096b9e767da0e3f9f37dafa76546) Change-Id: I056ade2f95bc8d82dfe092de7ecddba588cc5b72
* | | | | | | | | | libstagefright: check overflow before memory allocation in OMXCodec.cppWei Jia2015-08-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23416608 Change-Id: I4dacd38ed42db8f4887c3ee386dc909451f4346f
* | | | | | | | | | am 99187615: am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am ↵Abhishek Arya2015-08-201-2/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev * commit '99187615b2cb42e39842083c2998a97e8277a5d5': Check RTSP payload length
| * | | | | | | | | am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe: am ↵Abhishek Arya2015-08-201-2/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 635d38a8: Merge "Check RTSP payload length" into klp-dev * commit 'd3b6f9c17ed10df01d682b0fac6b13fca396e5fb': Check RTSP payload length
| | * | | | | | | | am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP ↵Abhishek Arya2015-08-201-2/+3
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | payload length" into klp-dev * commit 'a27fe8d7cc1413041e38f8c74f1f6510bdc44627': Check RTSP payload length
| | | * | | | | | | am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" ↵Abhishek Arya2015-08-201-2/+3
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '2fd79fa39a0ec347a80ceb5b056ed5053002f59e': Check RTSP payload length
| | | | * | | | | | am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-devAbhishek Arya2015-08-201-2/+3
| | | | |\ \ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb2acbfed69d18aa4693c03d8a77cd45daf8af8d': Check RTSP payload length
| | | | | * | | | | am 635d38a8: Merge "Check RTSP payload length" into klp-devAbhishek Arya2015-08-201-2/+3
| | | | | |\ \ \ \ \ | | | | | | | |/ / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit '635d38a84414e26aaf6c4b5df7859fde196adeaf': Check RTSP payload length
| | | | | | * | | | Merge "Check RTSP payload length" into klp-devAbhishek Arya2015-08-201-2/+3
| | | | | | |\ \ \ \
| | | | | | | * | | | Check RTSP payload lengthMarco Nelissen2015-08-191-2/+3
| | | | | | | | |_|/ | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23346388 Change-Id: Ifd918cefc90527c2f52177c3ce0da7a13259ad08
| * | | | | | | | | am f526f687: am a07ad890: am 776bfd80: am 8a55bcb6: resolved conflicts for ↵Marco Nelissen2015-08-201-0/+7
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge of ced2dd3c to lmp-dev * commit 'f526f687a686201cae03dfa6d59917b91294e913': Sanity check padding/delay values for gapless playback
| | * | | | | | | | am 776bfd80: am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-devMarco Nelissen2015-08-201-0/+7
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '776bfd806a1619ac0944d4ea36330c4cde4d665d': Sanity check padding/delay values for gapless playback
| | | * | | | | | | am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-devMarco Nelissen2015-08-201-0/+7
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a55bcb640c8842348eb41495fdb8fe82cb0465d': Sanity check padding/delay values for gapless playback
| | | | * | | | | | resolved conflicts for merge of ced2dd3c to lmp-devMarco Nelissen2015-08-201-0/+7
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I5dbb4f7d6c38c75a54c59d5e59305657bc50ab10
| | | | | * | | | | am 2c880dde: Merge "Sanity check padding/delay values for gapless playback" ↵Abhishek Arya2015-08-201-0/+7
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '2c880dde90e4303f9201f46124ee879325c57ba0': Sanity check padding/delay values for gapless playback
| | | | | | * | | | Merge "Sanity check padding/delay values for gapless playback" into klp-devAbhishek Arya2015-08-201-0/+7
| | | | | | |\ \ \ \
| | | | | | | * | | | Sanity check padding/delay values for gapless playbackMarco Nelissen2015-08-181-0/+7
| | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23306638 Change-Id: I2b5160e0f58f90d3f67c3964f41f5734ec0da053
* | | | | | | | | | 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 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEADWei Jia2015-08-201-1/+19
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2562495de9338e14ca3a3ef74ce07a7b310cd1fb': 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
| | | | | | * | | | Merge "libstagefright: fix overflow in ↵Wei Jia2015-08-201-1/+19
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPEG4Source::parseSampleAuxiliaryInformationOffsets." into klp-dev
| | | | | | | * | | | libstagefright: fix overflow in ↵Wei Jia2015-08-201-1/+19
| | | | | | | | |_|/ | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPEG4Source::parseSampleAuxiliaryInformationOffsets. Bug: 23270724 Change-Id: Id7ba55c7bf6860fbfc892bbb6378aac644c82da4 (cherry picked from commit c51ab7dd82bf4e24666fc72a55e03e2f530204d5)
| * | | | | | | | | am e4bcb3f8: am 238a487a: am e3cb2507: am 4b995f73: Merge "libstagefright: ↵Wei Jia2015-08-202-3/+16
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev * commit 'e4bcb3f8d444a11afad90b22fbde051c81c295c8': libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
| | * | | | | | | | am e3cb2507: am 4b995f73: Merge "libstagefright: fix handling of ↵Wei Jia2015-08-202-3/+16
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev * commit 'e3cb25078b814b40f8e1506514bd17066935a51f': libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
| | | * | | | | | | am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and ↵Wei Jia2015-08-202-3/+16
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mNumSampleSizes in SampleTable." into lmp-dev * commit '4b995f73b581ce0705b537317f32ad76bddb55fa': libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
| | | | * | | | | | Merge "libstagefright: fix handling of mSampleTimeEntries and ↵Wei Jia2015-08-202-3/+16
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mNumSampleSizes in SampleTable." into lmp-dev
| | | | | * | | | | | libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in ↵Wei Jia2015-08-192-3/+16
| | | | | | |_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SampleTable. Bug: 23247055 Change-Id: I29ef59c7ff09248063714e5013f7c33f66c5eebd (cherry picked from commit 3564c4562f46bede6ef1ea716c4fd4f77e470ae8) (cherry picked from commit 108cd2dc8df55f3f2ecdfbb4bb0ae981a74b6860)
| * | | | | | | | | am 3dcb448f: am 4bb01def: am 84a4221e: am a9b3cd3c: am 5221133b: am ↵Wei Jia2015-08-201-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b2ae4351: libstagefright: fix overflow in pvdec_api.cpp. * commit '3dcb448f52cf05e7e0434c28bade68e898707053': libstagefright: fix overflow in pvdec_api.cpp.
| | * | | | | | | | am 84a4221e: am a9b3cd3c: am 5221133b: am b2ae4351: libstagefright: fix ↵Wei Jia2015-08-201-2/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow in pvdec_api.cpp. * commit '84a4221e305847fb0c8846122fe8f2bc7c2fda0a': libstagefright: fix overflow in pvdec_api.cpp.
| | | * | | | | | | am a9b3cd3c: am 5221133b: am b2ae4351: libstagefright: fix overflow in ↵Wei Jia2015-08-201-2/+2
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pvdec_api.cpp. * commit 'a9b3cd3c101b68522a3d8492cb3a19d8b5409329': libstagefright: fix overflow in pvdec_api.cpp.
| | | | * | | | | | am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.Wei Jia2015-08-201-2/+2
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| / / / / | | | | | |/ / / / | | | | | | | | | * commit '5221133bfa1585b4488b01cad165627b1cd17077': libstagefright: fix overflow in pvdec_api.cpp.