summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Define CHANNEL_MASK_* in terms of AUDIO_CHANNEL_OUT_*Glenn Kasten2014-04-301-18/+7
| | | | | | and use same suffixes Change-Id: I90b74ede171ba2550db4a220cfd1ad2e3caefe2d
* Remove AUDIO_CHANNEL_OUT_SURROUNDGlenn Kasten2014-04-302-64/+0
| | | | | | and corresponding downmix effect Change-Id: I1576aa373ca7acbb84d7742bacbd9c2da04a7a4c
* Merge "PlaylistFetcher: clear mTSParser on bad starting seq # hint"Robert Shih2014-04-281-0/+1
|\
| * PlaylistFetcher: clear mTSParser on bad starting seq # hintRobert Shih2014-04-251-0/+1
| | | | | | | | | | Bug: 14159556 Change-Id: If25187477066282d5980da3c4d8a76dcfcf54d27
* | AwesomePlayer: fixed division by zero in onBufferingUpdateRobert Shih2014-04-251-6/+4
| | | | | | | | | | Bug: 13911283 Change-Id: I968a274634a86f5c46f75dc533024dad44afc36b
* | Merge "Support VP8 encoder key frame interval and number of temporal layers ↵Alex Glaznev2014-04-243-12/+394
|\ \ | | | | | | | | | configuration."
| * | Support VP8 encoder key frame interval and number ofAlex Glaznev2014-04-243-12/+394
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | temporal layers configuration. - Change ACodec.cpp to populate VP8 extra parameters structure with key frame interval, number of temporal layers and quantization parameters. - Change software VP8 encoder to select frame temporal patterns and temporal layers bitrate distribution based on the number of layers similar to patterns used in WebRTC. - Calculate video frame duration in VP8 encoder from the timestamps. Bug: 11969958 Change-Id: Ia96054d886cd09d8c108dfe250fc5f4478eaa042
* | | am 474038ae: am 27158eb5: Merge "AArch64: AString::append for longs and ↵Nick Kralevich2014-04-211-21/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | pointers" * commit '474038aef32f47d080567e8519d916b069a4f707': AArch64: AString::append for longs and pointers
| * \ \ am 27158eb5: Merge "AArch64: AString::append for longs and pointers"Nick Kralevich2014-04-211-21/+21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '27158eb55de8150258faba6574fc51c7aa641516': AArch64: AString::append for longs and pointers
| | * \ \ Merge "AArch64: AString::append for longs and pointers"Nick Kralevich2014-04-211-21/+21
| | |\ \ \
| | | * | | AArch64: AString::append for longs and pointersMarcus Oakland2014-04-151-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AString::append methods for long, unsigned long and void * pointers were using char arrays of 16 elements, which were not long enough for 64-bit longs and pointers in __LP64__ systems. This resulted in "FORTIFY_SOURCE: vsprintf: prevented write past end of buffer. Calling abort()." when the android.media.cts.DecoderTest#testFlush CTS test was run. The AString::append methods that were using sprintf have been modifed to use snprintf instead, taking the sizeof the "s" array (which has been made 32 char without conditional compilation for __LP64__ where appropriate), and checking the return value to ensure that the string has not been truncated. After this change and changes to the types of OMX_U32 and OMX_S32 in the frameworks/native/include/media/openmax/OMX_Types.h header file, the android.media.cts.DecoderTest#testFlush CTS test passes. Change-Id: I76d897373473c82f52986f43a15b050b844a370a Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
* | | | | | Merge "BufferQueue: Increase max slots from 32 to 64"Dan Stoza2014-04-211-3/+5
|\ \ \ \ \ \
| * | | | | | BufferQueue: Increase max slots from 32 to 64Dan Stoza2014-04-111-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increases NUM_BUFFER_SLOTS from 32 to 64 and changes the mask returned by IGBC::getReleasedBuffers from 32 to 64 bits. Bug: 13174352 Change-Id: I1c41256ffbc30abcf9f7b0b5fcf53da40462da28
* | | | | | | am e1ff1051: am e0f20cea: Merge "libeffects: 64 bit compile issues"Mark Salyzyn2014-04-182-39/+41
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | | * commit 'e1ff1051ffee8fb650741ad133f0f28b73eb7a73': libeffects: 64 bit compile issues
| * | | | | am e0f20cea: Merge "libeffects: 64 bit compile issues"Mark Salyzyn2014-04-182-39/+41
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'e0f20cea4a40deaabd2b409ab301f6fd7b2e8e7f': libeffects: 64 bit compile issues
| | * | | | libeffects: 64 bit compile issuesMark Salyzyn2014-04-182-39/+41
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32dd13d307572fee91150f8e113df78924ca0067
* | | | | | 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-1512-178/+61
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1513-179/+62
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-153-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
| | * | | | | media: 64 bit compile issuesMark Salyzyn2014-04-1512-178/+61
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 29fe1ea4: am 9829344d: Merge "media: memset sizeof argument issues"Mark Salyzyn2014-04-141-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1': media: memset sizeof argument issues
| * | | | am 9829344d: Merge "media: memset sizeof argument issues"Mark Salyzyn2014-04-143-3/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '9829344d526f87ca745208f04216ec795b239581': media: memset sizeof argument issues
| | * | | Merge "media: memset sizeof argument issues"Mark Salyzyn2014-04-143-3/+3
| | |\ \ \
| | | * | | media: memset sizeof argument issuesMark Salyzyn2014-04-113-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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-1169-160/+210
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '52a861d2825544fe2eb90f8e5f6351d02ff95536': warnings be gone.
| | * | warnings be gone.Andreas Huber2014-04-1169-160/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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
|\ \ \ \
generated by cgit v1.1 at 2024-05-18 03:24:06 +0000