summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* am f5f24006: am cd4eb72e: Merge "media: -Werror re-enabled"Mark Salyzyn2014-04-152-2/+2
|\ | | | | | | | | * commit 'f5f24006f7bd997c6bca00804ec0f35bddd7ccc2': media: -Werror re-enabled
| * am cd4eb72e: Merge "media: -Werror re-enabled"Mark Salyzyn2014-04-152-2/+2
| |\ | | | | | | | | | | | | * commit 'cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed': media: -Werror re-enabled
| | * Merge "media: -Werror re-enabled"Mark Salyzyn2014-04-152-2/+2
| | |\
| | | * media: -Werror re-enabledMark Salyzyn2014-04-152-2/+2
| | | | | | | | | | | | | | | | Change-Id: I62fdb78e8acefafd468ce2e5aa9e78eba0dd0f48
* | | | am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-1510-173/+55
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17': media: use size_t for integer iterator to Vector::size() media: 64 bit compile issues
| * | | am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-1511-174/+56
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * commit '839d11d1f7be9dff2f06c7d30a9eb39cb6782078': media: use size_t for integer iterator to Vector::size() media: 64 bit compile issues
| | * | media: use size_t for integer iterator to Vector::size()Mark Salyzyn2014-04-151-1/+1
| | | | | | | | | | | | | | | | Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
| | * | media: 64 bit compile issuesMark Salyzyn2014-04-1510-173/+55
| | |/ | | | | | | | | | | | | | | | | | | | | | - change internal sized types to use stdint.h - printf & scanf formats - size_t or unsigned int for iterators Change-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446
| * | am 432ed3d6: Merge "libstagefright: fix 64-bit warnings"Mark Salyzyn2014-04-1514-46/+54
| |\ \ | | |/ | | | | | | | | | * commit '432ed3d66d09464778df31c73374ee897f7b8840': libstagefright: fix 64-bit warnings
| | * libstagefright: fix 64-bit warningsColin Cross2014-04-1414-46/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | %lld -> %" PRId64 " for int64_t %d -> %zu for size_t Also fixes some casts from void* to integer types, and some comparisons between signed and unsigned. (cherry picked from commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81) Change-Id: I76ba94d0b67776fd7abdc83b43d47c61d6c32f4c
| * | am 9829344d: Merge "media: memset sizeof argument issues"Mark Salyzyn2014-04-141-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '9829344d526f87ca745208f04216ec795b239581': media: memset sizeof argument issues
| | * Merge "media: memset sizeof argument issues"Mark Salyzyn2014-04-141-1/+1
| | |\
| | | * media: memset sizeof argument issuesMark Salyzyn2014-04-111-1/+1
| | | | | | | | | | | | | | | | Change-Id: I37ef154eea0f77fb7f22faf6891f3025f6ff346e
* | | | am b1b1e303: am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build ↵Mark Salyzyn2014-04-112-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 1119326" * commit 'b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9': Fix aosp_arm64 mirror-aosp-master build 1119326
| * | | am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119326"Mark Salyzyn2014-04-113-6/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'e523889332b88348e673137d272854278acbef8f': Fix aosp_arm64 mirror-aosp-master build 1119326
| | * | Fix aosp_arm64 mirror-aosp-master build 1119326Mark Salyzyn2014-04-113-6/+6
| | |/ | | | | | | | | | | | | | | | Remove -Werror that was set in 'warnings be gone' Change-Id: I2379dc56f04a6d0ac50f90e6d1cdf05fce3a5c30
* | | Revert "build fix for aosp-idea133 @ 1119318"Colin Cross2014-04-111-0/+1
| | | | | | | | | | | | | | | | | | Build fix is needed in AOSP, but in master it re-introduces a warning and breaks the build on -Werror. Revert it in master. This reverts commit effbb3a9b72050dbe150af7302d9148fe7e927d3.
* | | am a7281ee1: am a133bc87: Merge "build fix for aosp-idea133 @ 1119318"Mark Salyzyn2014-04-111-1/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50': build fix for aosp-idea133 @ 1119318
| * | am a133bc87: Merge "build fix for aosp-idea133 @ 1119318"Mark Salyzyn2014-04-111-1/+0
| |\ \ | | |/ | | | | | | | | | * commit 'a133bc87eb8269a6fa61772cb708f10c9c3b7a87': build fix for aosp-idea133 @ 1119318
| | * Merge "build fix for aosp-idea133 @ 1119318"Mark Salyzyn2014-04-111-1/+0
| | |\
| | | * build fix for aosp-idea133 @ 1119318Mark Salyzyn2014-04-111-1/+0
| | | | | | | | | | | | | | | | Change-Id: I34084ebb48318628d46c2ff7ca567bd7638619e4
| * | | am 0938c6f7: Merge "warnings be gone (4/4)"Mark Salyzyn2014-04-111-2/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '0938c6f7a1e713030b04e32548012f0c29c94f4d': warnings be gone (4/4)
| | * | warnings be gone (4/4)Mark Salyzyn2014-04-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) (squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81) Change-Id: I55df09714a0e1cb98a44c8fcddac2c646ae5e139
| * | | am 2a27a640: Merge "warnings be gone (3/4)"Mark Salyzyn2014-04-111-2/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '2a27a640d0d9747659cc609b4384ffead090866e': warnings be gone (3/4)
| | * | warnings be gone (3/4)Mark Salyzyn2014-04-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) (squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81) Change-Id: I0c5a0c3ea32bb5091d90c7391c67edd02e50397f
| * | | am 79724856: Merge "warnings be gone (2/4)"Mark Salyzyn2014-04-111-5/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '797248568b5ba32606ac0d8de024190e3cc95973': warnings be gone (2/4)
| | * | warnings be gone (2/4)Mark Salyzyn2014-04-111-5/+5
| | |/ | | | | | | | | | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) (squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81) Change-Id: I048a2c6868515716c7cd7319a3d0abe6311dac4e
| * | am 52a861d2: Merge "warnings be gone."Mark Salyzyn2014-04-1165-148/+196
| |\ \ | | |/ | | | | | | | | | * commit '52a861d2825544fe2eb90f8e5f6351d02ff95536': warnings be gone.
| | * warnings be gone.Andreas Huber2014-04-1165-148/+196
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts or errors downstream to a minimum. Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
* | | stagefright: handle corrupt matroska files gracefullyLajos Molnar2014-04-041-5/+13
| | | | | | | | | | | | | | | | | | Bug: 13693438 Bug: 13744158 Change-Id: I557595b5b5d4a20934f79e00a622b06d13378223
* | | stagefright: log uri protocols, and opt-in to log full uriLajos Molnar2014-04-046-15/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added property media.stagefright.log-uri. Set it to true or 1 to log uris by AwesomePlayer. Added utility function to get uri debug string based on incognito and log opt-in status. Change-Id: I5ccc23079ddfb120dd9703a3ed651a162ed5acec Related-Bug: 6994761
* | | stagefright: add AString constructor from String8Lajos Molnar2014-04-041-0/+8
| | | | | | | | | | | | Change-Id: I85b37b6dee4ea9d5f7f1c1a40ff405a01a0c67f1
* | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-04-046-41/+41
|\ \ \
| * | | Remove deprecated BufferQueue constructorDan Stoza2014-03-126-41/+41
| | | | | | | | | | | | | | | | | | | | Bug: 13415624 Change-Id: I1a824d09ce582ee54753683d30cdc23813c13b6b
* | | | Merge commit '52a23bd3' into manualmergeGlenn Kasten2014-04-037-15/+15
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I7a6105f467a2fa3631c62be3d306845e9cf9b365
| * | | am 51b3ea2b: Merge "64-bit: Correction to OMX_U32 and OMX_S32"Glenn Kasten2014-04-037-16/+16
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '51b3ea2b8f7298bffbd246c65a606cd053357b66': 64-bit: Correction to OMX_U32 and OMX_S32
| | * | 64-bit: Correction to OMX_U32 and OMX_S32Glenn Kasten2014-04-027-16/+16
| | | | | | | | | | | | | | | | Change-Id: I9c41bb34c35595ac19a7ab8faaacde8cb4fa9a15
| * | | am 93bbc834: Merge "Fix aac decoder flush"Glenn Kasten2014-04-031-0/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '93bbc8343133b910aeae536617efce978040bbae': Fix aac decoder flush
| | * | Fix aac decoder flushMarco Nelissen2014-04-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | b/8543366 Change-Id: I746ffed6289486b802a2292bfc492ea6c780ed0b
| * | | am 2b2fbe29: Merge "Fix decoder EOS handling"Glenn Kasten2014-04-026-203/+213
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '2b2fbe299163b544668b41f594943a19b78dafd3': Fix decoder EOS handling
| | * | Fix decoder EOS handlingMarco Nelissen2014-04-026-203/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conceptually it should be the same whether EOS is signalled on the last buffer holding data, or an empty buffer that follows. Make it so that this actually behaves the same for mp3, AAC and Vorbis. b/8747869 Change-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92
| * | | am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep ↵Lajos Molnar2014-03-282-55/+30
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more buffers with the BufferQueue"" into klp-dev * commit '1000d426bedb1ec38bdfff98fc8f004b64af13cb': DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
| | * \ \ am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers ↵Lajos Molnar2014-03-282-55/+30
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with the BufferQueue"" into klp-dev * commit 'f780d28de2e3cf7f6b26b9626321dba75719736e': DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
| | | * \ \ Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the ↵Lajos Molnar2014-03-282-55/+30
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | BufferQueue"" into klp-dev
| | | | * | | DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"Lajos Molnar2014-03-272-55/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b635b0e66b257ab442e230bca96afd5105cf6829. Bug: 13655631
| * | | | | | am 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow ↵Lajos Molnar2014-03-282-10/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for minUndequeuedBufs to be one less"" into klp-dev * commit '8bf96c011ff4128f9bf06b892a38d869192d6a25': DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
| | * | | | | am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for ↵Lajos Molnar2014-03-282-10/+7
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minUndequeuedBufs to be one less"" into klp-dev * commit '3d4e4fcbcfc5c16dd794591727f5c713831ab6dc': DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
| | | * | | | Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be ↵Lajos Molnar2014-03-282-10/+7
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | one less"" into klp-dev
| | | | * | | DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"Lajos Molnar2014-03-272-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a0470879e25394cb85437366fa53ce8055cd556f. Bug: 13655631
| * | | | | | am 30890210: am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite ↵Lajos Molnar2014-03-211-0/+12
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loop when parsing ADTS." into klp-dev * commit '3089021031d6ad0f2b330567f108aec03fa13994': DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
generated by cgit v1.1 at 2024-06-08 08:19:53 +0000