summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | 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.
| | | | | | * | | | Merge "MPEG4Extractor: ensure buffer size is not less than 8 for ↵Wei Jia2015-10-061-0/+6
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LastCommentData." into klp-dev
| | | | | | | * | | | 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 711e9dfc: am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am ↵Marco Nelissen2015-10-061-0/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame * commit '711e9dfc85dfa41c8c840103bd510e98d9b663da': Don't crash when there's no conceal frame
| * | | | | | | | | am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am ↵Marco Nelissen2015-10-061-0/+5
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame * commit '8b3aa04a625dfd3adf68118e64da1eafec9db594': Don't crash when there's no conceal frame
| | * | | | | | | | am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am ↵Marco Nelissen2015-10-061-0/+5
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 257b3bc5: Don\'t crash when there\'s no conceal frame * commit 'a0c94bc6582dde27ed31fbb771d7eb758fb9adbe': Don't crash when there's no conceal frame
| | | * | | | | | | am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when ↵Marco Nelissen2015-10-061-0/+5
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there\'s no conceal frame * commit '7ce825833ad65cebfded3f35457925ae9e00124a': Don't crash when there's no conceal frame
| | | | * | | | | | am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frameMarco Nelissen2015-10-061-0/+5
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f7d1f627b0b1139f82f16baee482476cc10ccde4': Don't crash when there's no conceal frame
| | | | | * | | | | am 257b3bc5: Don\'t crash when there\'s no conceal frameMarco Nelissen2015-10-061-0/+5
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '257b3bc581bbc65318a4cc2d3c22a07a4429dc1d': Don't crash when there's no conceal frame
| | | | | | * | | | Don't crash when there's no conceal frameMarco Nelissen2015-10-051-0/+5
| | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24630158 Change-Id: If042aebebb58c218eb7bbf01dcddbcbd05dca1d6
| | | | | * | | | am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcelFlanker2015-09-291-3/+22
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3737a3fa121796131ea5b782230e65dad9ccf90f': DO NOT MERGE stagefright: fix AMessage::FromParcel
| | | | | | * | | DO NOT MERGE stagefright: fix AMessage::FromParcelFlanker2015-09-251-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add check for incoming mNumItems. Also add check readCString return value. Fix style & add log. Bug: 24123723 Change-Id: If41a5312c27d868f481893eef56019b6807c39b7
| | | | | * | | | am b21a6420: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous ↵Wonsik Kim2015-09-164-7/+21
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | early free" into klp-dev * commit 'b21a642067477c72f419956da0ca8dafe0c04eab': DO NOT MERGE NuCachedSource2: fix possible erroneous early free
| | | | | | * | | Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into ↵Wonsik Kim2015-09-164-7/+21
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev
| | | | | | | * | | DO NOT MERGE NuCachedSource2: fix possible erroneous early freeWonsik Kim2015-09-144-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the constructor of NuCachedSource2 sent a message to AHandlerReflector object, AHandlerReflector::onMessageReceived could have executed just before the object gets wrapped in a strong pointer, resulting in erroneous early free. Fix the issue by using static Create function to ensure the message is sent after the object is wrapped in a sp. Bug: 23882800 Change-Id: I38a9d7a3083f184b4c81d0b00ba1661721278855
| | | | | * | | | | am b659b4c7: Merge "DO NOT MERGE fix build" into klp-devWonsik Kim2015-09-111-0/+1
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b659b4c7e1405056d189b44bd96036b6500dd378': DO NOT MERGE fix build
| | | | | | * | | | Merge "DO NOT MERGE fix build" into klp-devWonsik Kim2015-09-111-0/+1
| | | | | | |\ \ \ \
| | | | | | | * | | | DO NOT MERGE fix buildWonsik Kim2015-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23707088 Change-Id: Ib0d6cbc52710f33310d21b2eae1f243f0f8e8bca
| | | | | * | | | | | am 1784a8db: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding ↵Wonsik Kim2015-09-112-94/+21
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | once again" into klp-dev * commit '1784a8dbbc73b3e6033340d107b6c08478b962c8': DO NOT MERGE Avoid size_t overflow in base64 decoding once again
| | | | | | * | | | | Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" ↵Wonsik Kim2015-09-112-94/+21
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | / / / | | | | | | | |/ / / | | | | | | |/| | | into klp-dev
| | | | | | | * | | DO NOT MERGE Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-092-94/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to foundation base64 function in OggExtractor and fix the issue there. Bug: 23707088 Change-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0
| | * | | | | | | | am 99214848: am 5226d6b7: am e64d4870: am 2b8cd9cb: stagefright: fix ↵Flanker2015-09-291-3/+25
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AMessage::FromParcel * commit '992148484a286dab886dd4d1b58dabacf1c1920f': stagefright: fix AMessage::FromParcel
| | | * | | | | | | am e64d4870: am 2b8cd9cb: stagefright: fix AMessage::FromParcelFlanker2015-09-291-3/+25
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e64d4870a543803d8172b80ad8eb198dfde6f361': stagefright: fix AMessage::FromParcel
| | | | * | | | | | stagefright: fix AMessage::FromParcelFlanker2015-09-251-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add check for incoming mNumItems. Also add check readCString return value. Fix style & add log. Bug: 24123723 Change-Id: If41a5312c27d868f481893eef56019b6807c39b7
| | * | | | | | | | DO NOT MERGE - Fix build for commit 69ae6a87Andy Hung2015-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test app on lmp-mr1-ub-dev but not on lmp-mr1-dev now needs liblog. Change-Id: Ia995d9101e85f6a68c85d3156fd6b78fa96c87e0
| | * | | | | | | | am e2cc5db8: am 6961db7e: am 04bbef0b: am 5c09132b: Merge "DO NOT MERGE ↵Wonsik Kim2015-09-214-7/+21
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NuCachedSource2: fix possible erroneous early free" into lmp-dev * commit 'e2cc5db8b09adb9d968f033f8e57674878054a8b': DO NOT MERGE NuCachedSource2: fix possible erroneous early free
| | | * | | | | | | am 04bbef0b: am 5c09132b: Merge "DO NOT MERGE NuCachedSource2: fix possible ↵Wonsik Kim2015-09-214-7/+21
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erroneous early free" into lmp-dev * commit '04bbef0b298bdbb76dbd6577cf00977ad496710d': DO NOT MERGE NuCachedSource2: fix possible erroneous early free
| | | | * | | | | | Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into ↵Wonsik Kim2015-09-164-7/+21
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev
| | | | | * | | | | | DO NOT MERGE NuCachedSource2: fix possible erroneous early freeWonsik Kim2015-09-144-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the constructor of NuCachedSource2 sent a message to AHandlerReflector object, AHandlerReflector::onMessageReceived could have executed just before the object gets wrapped in a strong pointer, resulting in erroneous early free. Fix the issue by using static Create function to ensure the message is sent after the object is wrapped in a sp. Bug: 23882800 Change-Id: I38a9d7a3083f184b4c81d0b00ba1661721278855
| | * | | | | | | | | am 93c38623: am c3708121: am 2d945b6a: am 4855cc3d: Merge "DO NOT MERGE ↵Wonsik Kim2015-09-202-93/+21
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid size_t overflow in base64 decoding once again" into lmp-dev * commit '93c3862303d7139cd60f5811e67eeafd0f30d38a': DO NOT MERGE Avoid size_t overflow in base64 decoding once again
| | | * | | | | | | | am 2d945b6a: am 4855cc3d: Merge "DO NOT MERGE Avoid size_t overflow in ↵Wonsik Kim2015-09-172-93/+21
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | base64 decoding once again" into lmp-dev * commit '2d945b6a5c348953f468a2cf22254bff874d5ae1': DO NOT MERGE Avoid size_t overflow in base64 decoding once again
| | | | * | | | | | | Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" ↵Wonsik Kim2015-09-142-93/+21
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | into lmp-dev
| | | | | * | | | | | DO NOT MERGE Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-142-93/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to foundation base64 function in OggExtractor and fix the issue there. This reverts commit 28314aef9e8a666dbb75bbd555f6566a6c991f1c. Bug: 23707088 Change-Id: I268bd50431de5b5e579343bf1b425c42ada6daba
| | * | | | | | | | | am eed3955c: am 5e46ca5a: am 3b130dbd: am c5121002: am c256004a: am ↵Wei Jia2015-09-201-1/+4
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error. * commit 'eed3955cb25731319444d9d17d74013c972499ab': libstagefright: fix A_Refl to return immediately when there is an error.
| | | * | | | | | | | am 3b130dbd: am c5121002: am c256004a: am 69ae6a87: libstagefright: fix ↵Wei Jia2015-09-171-1/+4
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A_Refl to return immediately when there is an error. * commit '3b130dbd985653e4ffc301bce1a63aab28ecc704': libstagefright: fix A_Refl to return immediately when there is an error.
| | | | * | | | | | | am c256004a: am 69ae6a87: libstagefright: fix A_Refl to return immediately ↵Wei Jia2015-09-121-1/+4
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| / / / / / | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when there is an error. * commit 'c256004a8cbf4dc1d647957243cf8be1a3c7bec4': libstagefright: fix A_Refl to return immediately when there is an error.
| | | | | * | | | | am 69ae6a87: libstagefright: fix A_Refl to return immediately when there is ↵Wei Jia2015-09-101-1/+4
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an error. * commit '69ae6a87342d5260d8d8660accc8aa1b9367dbbe': libstagefright: fix A_Refl to return immediately when there is an error.
| | | | | | * | | | libstagefright: fix A_Refl to return immediately when there is an error.Wei Jia2015-09-081-1/+4
| | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23609206 Change-Id: I2ad25fb208df17f5a5b6d6b356eff2f400627f22 (cherry picked from commit 715dcb9c90d86c1a02a0da056f3cee8875ad1230)
* | | | | | | | | am cb70fdbe: Merge "OMX: allow only secure codec to remotely call ↵Wei Jia2015-10-064-0/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocateBuffer." into mnc-dev * commit 'cb70fdbe9be14002a4303a93f07a13c508c00d89': OMX: allow only secure codec to remotely call allocateBuffer.
| * | | | | | | | Merge "OMX: allow only secure codec to remotely call allocateBuffer." into ↵Wei Jia2015-10-064-0/+13
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| | * | | | | | | | OMX: allow only secure codec to remotely call allocateBuffer.Wei Jia2015-10-024-0/+13
| | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24310423 Change-Id: Iebcfc58b447f925ec2134898060af2ef227266a3