summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/foundation
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-071-0/+10
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/av into cm-13.0 Android 6.0.1 release 3 Change-Id: I2f2a1fe1b58c828e8341556996211562d6e195ab
| * ALooper::awaitResponse gets reply and returns immediately if the looper is ↵Ronghua Wu2015-11-021-16/+4
| | | | | | | | | | | | | | stopped. Bug: 25088488 Change-Id: Id33d5d75f1173db52d00f4ff71d4c2c4f27f72f5
| * Allow ALooper::awaitResponse to return immediately if the looper is stopped.Ronghua Wu2015-10-221-2/+24
| | | | | | | | | | Bug: 25088488 Change-Id: I63e69886a8e9cffcaad675ca1a5642c0abf3b466
* | Fix benign unsigned integer overflowVishwath Mohan2015-11-051-2/+2
| | | | | | | | | | | | | | | | Fixes a benign overflow error in ANetworkSession.cpp Bug: 23110888 Change-Id: Ic64f5100ab1e3f2ffe247ca4f7b40d38c1ff0c2a (cherry picked from cfe302317c873001b0b35352d9f4f52c39f6f4b7)
* | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-051-3/+25
|\ \ | |/ | | | | | | | | Android 6.0.0 release 26 Change-Id: I8a57007bf6efcd8b95c3cebf5e0444345bdd4cda
| * stagefright: fix AMessage::FromParcelFlanker2015-09-241-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 Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-181-3/+8
| | | | | | | | | | | | | | | | Switch to foundation base64 function in OggExtractor and fix the issue there. Bug: 23707088 Change-Id: If8ba3347c213fe7a36668c943ed264f2871ad468
| * am 3c4216e5: am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84: Merge ↵Wonsik Kim2015-09-161-8/+3
| |\ | | | | | | | | | | | | | | | | | | "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev * commit '3c4216e5c76727f4af229e8b2a338e15f67e1ee9': Revert "Avoid size_t overflow in base64 decoding once again"
| | * am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84: Merge "Revert "Avoid ↵Wonsik Kim2015-09-161-8/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | size_t overflow in base64 decoding once again"" into lmp-dev * commit '2fa6a5ad06e696627b0ca495a031531ac47ddd6d': Revert "Avoid size_t overflow in base64 decoding once again"
| | | * am 92efd0c5: am b5611b84: Merge "Revert "Avoid size_t overflow in base64 ↵Wonsik Kim2015-09-161-8/+3
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoding once again"" into lmp-dev * commit '92efd0c559d4d78880fc06544c662129fe7f6e1d': Revert "Avoid size_t overflow in base64 decoding once again"
| | | | * Revert "Avoid size_t overflow in base64 decoding once again"Wonsik Kim2015-09-111-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c9ac5dfdafed1c66beae090cafa97002764e0ca3. Change-Id: Iae9707bbd8641a0bb00fcda39a20eb8b8f4f5232
| | * | | am c259acce: am f7c40163: am 5f5fc26c: am 322e2dc5: Merge "Avoid size_t ↵Wonsik Kim2015-09-161-3/+8
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | overflow in base64 decoding once again" into lmp-dev * commit 'c259acce721bdc6095ae0d5d7b35aea24f2b68c7': Avoid size_t overflow in base64 decoding once again
| | | * | am 5f5fc26c: am 322e2dc5: Merge "Avoid size_t overflow in base64 decoding ↵Wonsik Kim2015-09-161-3/+8
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | once again" into lmp-dev * commit '5f5fc26cfb4f8db965d6ded855ce60ee87ff90ac': Avoid size_t overflow in base64 decoding once again
| | | | * Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-091-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to foundation base64 function in OggExtractor and fix the issue there. Bug: 23707088 Change-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0
| | * | | am 228c3de3: am ccc02053: am ef2c6e04: am 45e493e4: Merge "Merge commit ↵Wei Jia2015-08-201-3/+8
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | \'5a289b87\' into HEAD" into lmp-dev * commit '228c3de31bc7c8087b78169cc30974b5d99a47fa': ABuffer: reset members when memory allocation fails.
| | | * | am ef2c6e04: am 45e493e4: Merge "Merge commit \'5a289b87\' into HEAD" into ↵Wei Jia2015-08-181-3/+8
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'ef2c6e044676bf9f0ead4359d7a1840236150e4d': ABuffer: reset members when memory allocation fails.
| | | | * Merge commit '5a289b87' into HEADWei Jia2015-08-171-3/+8
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ABuffer: reset members when memory allocation fails. Bug: 22077698 (cherry picked from commit 94b0badc025b14141ff234e3e4e2745411742bac) Change-Id: I359ec16e524ffb298c143c3d72fbf1a3af72d663
| | | | | * ABuffer: reset members when memory allocation fails.Wei Jia2015-08-141-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22077698 Change-Id: I2beb724662d041ad2339d0f4c7f983e7ac5e5e6f (cherry picked from commit 94b0badc025b14141ff234e3e4e2745411742bac)
| * | | | | Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-071-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to foundation base64 function in OggExtractor and fix the issue there. Bug: 23707088 Change-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0
* | | | | | Merge tag 'android-6.0.0_r5' into HEADRicardo Cerqueira2015-11-031-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 5 Conflicts: media/libstagefright/OggExtractor.cpp media/libstagefright/Utils.cpp Change-Id: I2ea44836c5cc3da8ffa2092522293c433bf7538c
| * | | | | | DO NOT MERGE Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-281-3/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to foundation base64 function in OggExtractor and fix the issue there. Bug: 23707088 Change-Id: If8ba3347c213fe7a36668c943ed264f2871ad468
* | | | | | Stagefright: Add Checks for allocationsSathishKumar Mani2015-10-061-7/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warn allocation failures explicitly rather than crash trying to access unallocated memory Change-Id: Ie86c3ac130917e1f4030eb8207ac8350cba7711d
* | | | | stagefright: disable automatic experimentsLajos Molnar2015-07-291-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow manually-enabled experiments only in eng and userdebug builds Bug: 20894667 Change-Id: Ie6c93e9482a84ed3aaf6aa0abd909f14cfea4e9b
* | | | | ABuffer: reset members when memory allocation fails.Wei Jia2015-07-201-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22077698 Change-Id: I2beb724662d041ad2339d0f4c7f983e7ac5e5e6f
* | | | | stagefright: allow controlling experiments from propertyLajos Molnar2015-07-101-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20894667 Change-Id: Icb2209e12ed6a1820b8f33626ca02aabcff03321
* | | | | don't trigger an integer underflow when decrementing.Nick Kralevich2015-06-132-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When decrementing "i", eventually i will equal zero. When that happens, i-- underflows. This causes a crash when code which uses clang's -fsanitize=unsigned-integer-overflow is run. Avoid trigging an unsigned integer underflow. Change-Id: I61709cb01f56fdb36d631aa95579e8bd09cafd12
* | | | | stagefright: enable experimentsLajos Molnar2015-05-071-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20894716 Change-Id: I8c05b99dca8b3099a3a1b2b465f0f58bef786572
* | | | | stagefright: make more warnings errorsLajos Molnar2015-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9b1ad60fbfb866dbf9c00843e06553c3eb25c113
* | | | | stagefright: warnings be gone, some are now errors, use clangLajos Molnar2015-04-171-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I81f438ae444f04c12ae27ae4ef6d073033de172c
* | | | | stagefright: don't use ALooperRoster mutex for reply handlingLajos Molnar2015-03-103-43/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change replyID-s from uint32_t to an object Move reply handling into the loopers (to reuse a common mutex) Bug: 19607784 Change-Id: Iaa035b846c424c5687ed17ce1079b325e86c54be
* | | | | stagefright: remove AMessage methods using id()Lajos Molnar2015-03-052-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19607784 Change-Id: I4b2ca396fb50cde5e7dc9801add69037febe698d
* | | | | stagefright: use handler instead of handler-id in AMessageLajos Molnar2015-03-054-93/+82
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | This avoids locking gLooperRoster mutex on post() and deliver(). Bug: 19607784 Change-Id: If6d9d7884dbb08fc390983bda896d223803476ba
* | | | am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-181-0/+82
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'a963dacc1b44ec80742c86ce75611eb9cfa936ea': Add dumpsys info
| * | | | Add dumpsys infoMarco Nelissen2015-02-181-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print a list of looper-handler pairs and the number of messages they've processed, and optionally break those stats out by message type. Change-Id: I68ce4a7003152d5c9b5cb3f42e6f3949b471aa6e
* | | | | Track change of IInterface::asBinder from instance method to static methodBrian Carlstrom2015-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iee262d4223ec3c61dab5ca8d9d7e4a14795da1c3
* | | | | am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload ↵Lajos Molnar2015-02-102-1/+112
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | pause timeout" into lmp-mr1-dev * commit '4fc5d758d6722bedf341e5d93a0ba5698c658c29': nuplayer: acquire wakelock during offload pause timeout
| * | | | nuplayer: acquire wakelock during offload pause timeoutWeiyin Jiang2015-02-062-1/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hold a wakelock while paused in audio offload mode, until audio teardown event is received, or pause is canceled. Since ARM cores are sleeping, the delayed AMessage will not be received, and the audio output driver will not be closed. This blocks XO shutdown. Bug: 19297092 Change-Id: I3d11fef633e3f2783f4aa31e71285e2fa09d234c
* | | | | am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."Elliott Hughes2015-02-043-19/+19
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit '6a025acb630a3ac4a84715d188aeb48f1946bc3f': Move AString's StringPrintf out of the way.
| * | | Move AString's StringPrintf out of the way.Elliott Hughes2015-02-043-19/+19
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | We should come back and replace AString with std::string and switch to the "real" StringPrintf family, but this fixes the ODR violation that was preventing us from booting. Bug: 19265750 Change-Id: I798eb9ca5dd634e44625af5e583439ef9f0cdc35
* | | stagefright: add runtime debug supportLajos Molnar2014-11-123-0/+197
|/ / | | | | | | | | Bug: 18285408 Change-Id: I56346f4652b2c5f7ef5fa3003fd8676051339384
* | NuPlayer: Fix decoder error handlingAndy Hung2014-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | Upon error, release MediaCodec after flushing data. Report errors when they occur with ALOGE. Fix onInputBufferFilled mInputBufferIsDequeued check. Bug: 17423087 Bug: 17622642 Change-Id: I316601a19d5ec95cf8e14f5bc0418a05ec423041
* | MediaBuffer: ABuffer will release MediaBuffer when it's destructed.Wei Jia2014-09-191-2/+21
| | | | | | | | | | Bug: 17454455 Change-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99
* | stagefright: don't use AAtomizer in AMessageLajos Molnar2014-09-101-30/+93
| | | | | | | | | | Bug: 15094301 Change-Id: Ib82fb6d8fb6b48402d81f411123b3d924368eb93
* | Move stale handler cleanup to constructorMarco Nelissen2014-08-281-4/+4
| | | | | | | | | | | | | | | | This avoids the potential side effect of deleting more ALoopers inside the cleanup loop. Bug: 17059501 Change-Id: I41efaf490449b95fedfe01175f3b19067d50da24
* | Fix more potential deadlocks in ALooperRosterMarco Nelissen2014-08-281-29/+12
| | | | | | | | | | Bug: 17059501 Change-Id: I242f2859527bed2d6e275c27de94fb19f4dcdc28
* | Fix potential deadlock in unregisterStaleHandlers()Marco Nelissen2014-08-271-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | The scenario is that a call to unregisterStaleHandlers() is in progress, and is holding a temporary sp<ALooper> reference to an active ALooper inside of the loop. At this point the only other remaining external reference to the ALooper goes away, so the temporary sp<ALooper> in the loop is now the only reference keeping that object alive. When the loop iterates and the sp<> goes out of scope, the ALooper destructor is called, which in turn calls unregisterStaleHandlers again, resulting in a recursive lock. Bug: 17300093 Change-Id: I116f2ffab4ae7c43b6bcf54a367ae6f9d77c9626
* | libstagefright: foundation: Add syntactic sugar to the cast.Sasha Levitskiy2014-08-081-1/+1
| | | | | | Change-Id: I0b6b3ae440addd4891c26b0639bd6e647a7b031e
* | libstagefright_foundation: fix buildColin Cross2014-08-071-1/+1
| | | | | | | | Change-Id: If61766efa8834df175bd5758c760344364458d4a
* | stagefright: add AString parceling, and equal/compareIgnoreCaseLajos Molnar2014-08-071-0/+24
| | | | | | | | | | Bug: 11990470 Change-Id: If43ada5d2e768931f4409e499eaa268edade0500
* | stagefright: add ABuffer.CreateAsCopyLajos Molnar2014-07-251-0/+8
| | | | | | | | | | Bug: 10706245 Change-Id: I8c4e96a2581a039e9e8237c3e09e2c22226da055