summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Move frameworks/av off <sys/atomics.h>.Elliott Hughes2014-05-221-3/+2
| | | | | Bug: 14903517 Change-Id: I92cdfc618d83fd914cfb558a07b1deae0255fccb
* Move frameworks/av from fdprintf to POSIX dprintf.Elliott Hughes2014-05-221-1/+1
| | | | | Bug: 11156955 Change-Id: Ia98cd16b4c1f7be87cf060b7456de4f40896bacb
* Move frameworks/av off private API.Elliott Hughes2014-05-211-31/+31
| | | | | Bug: 11156955 Change-Id: Ib3bb9d66a2bf92977c2445b62aa074a2d7a45aea
* Move frameworks/av off __futex_syscall3.Elliott Hughes2014-05-211-10/+10
| | | | | Bug: 11156955 Change-Id: I943080bc51b6efa781059b48b5b5ecc4fa287512
* libstagefright foundation: fix uninitialized varibale warningAmit Pundir2014-05-151-1/+1
| | | | | | | | gcc-4.9 reports warning for this uninitialized variable and -Werror make this warning fatal. Change-Id: I6901362246d53deeded78fa38ad656b167705346 Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
* Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
|\
| * AwesomePlayer: use PTS for queueBufferLajos Molnar2014-05-011-7/+10
| | | | | | | | Change-Id: I1c14ad4784c799c46cf06a14b0f00c5e4d01f718
* | Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
|\ \ | |/
| * Smooth out AwesomePlayerLajos Molnar2014-05-012-4/+25
| | | | | | | | | | | | Use clock estimator to smooth out audio time stamps. Change-Id: Iec1ff30c011069d06ff8051fc4839d00895463d6
* | Merge "AwesomePlayer: improve scheduling of video event to hit PTS"Lajos Molnar2014-05-021-3/+7
|\ \ | |/
| * AwesomePlayer: improve scheduling of video event to hit PTSLajos Molnar2014-05-011-3/+7
| | | | | | | | Change-Id: I7b19911acbde9b592b757b952d4ad63cd8efebed
* | Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"Lajos Molnar2014-05-022-0/+178
|\ \ | |/
| * stagefright: add ClockEstimator API and WindowedLinearFitEstimatorLajos Molnar2014-05-012-0/+178
| | | | | | | | Change-Id: I74474c385848a8eab2ac0da7c069510378e2b217
* | Merge "When passing a size_t via binder, use 64-bits unconditionally"Glenn Kasten2014-05-027-35/+35
|\ \ | |/ |/|
| * When passing a size_t via binder, use 64-bits unconditionallyGlenn Kasten2014-02-137-35/+35
| | | | | | | | | | | | | | | | | | 64-bits is almost always over-kill. But it's easier and cleaner to change the binder code to be accurate, than to rename all the the API parameter types to be 32-bit. Bug: 12381724 Change-Id: Ib8f198d814a2027760ef24e9e3feacee21a973b1
* | Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
|\ \
| * | Add missing includeIgor Chernyshev2014-04-021-0/+1
| | | | | | | | | | | | Change-Id: I9fc3ebf60b98760611ac2071c7c519a0f8326341
* | | Merge "ACodec: add frame render/drop systrace"Lajos Molnar2014-05-011-0/+7
|\ \ \
| * | | ACodec: add frame render/drop systraceLajos Molnar2014-04-301-0/+7
| | | | | | | | | | | | | | | | Change-Id: I7a33d4a937d039fd454b889ddb12b7ca1c0ff3c2
* | | | Temporary workaround for log spamGlenn Kasten2014-05-011-0/+5
|/ / / | | | | | | | | | | | | Bug: 13790505 Change-Id: Icfc403bceaefdede1af65dfd70ba3e8b26abab02
* | | Fix format warningsGlenn Kasten2014-04-281-3/+3
| | | | | | | | | | | | Change-Id: Id7aded4287cc8d5387a20389d3ef6220d67d1d88
* | | Add private method NBLog::Reader::dumpLine()Glenn Kasten2014-04-281-37/+43
| | | | | | | | | | | | | | | | | | | | | This allows us to abstract out fdprintf vs ALOGI so that callers don't need an 'if' at every location. Change-Id: I4c68185fc19f32caeaed93347e6b7d09b8d4c4d8
* | | 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>
* | | | libeffects: 64 bit compile issuesMark Salyzyn2014-04-182-39/+41
| | | | | | | | | | | | | | | | Change-Id: I32dd13d307572fee91150f8e113df78924ca0067
* | | | Merge "media: -Werror re-enabled"Mark Salyzyn2014-04-152-2/+2
|\ \ \ \
| * | | | media: -Werror re-enabledMark Salyzyn2014-04-152-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I62fdb78e8acefafd468ce2e5aa9e78eba0dd0f48
* | | | | 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
* | | | 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
* | | 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
* | | | 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
* | | 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
* | | | warnings be gone (4/4)Mark Salyzyn2014-04-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) (squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81) Change-Id: I55df09714a0e1cb98a44c8fcddac2c646ae5e139
* | | | warnings be gone (3/4)Mark Salyzyn2014-04-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) (squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81) Change-Id: I0c5a0c3ea32bb5091d90c7391c67edd02e50397f
* | | | warnings be gone (2/4)Mark Salyzyn2014-04-111-5/+5
|/ / / | | | | | | | | | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) (squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81) Change-Id: I048a2c6868515716c7cd7319a3d0abe6311dac4e
* | | 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
* | | 64-bit: Correction to OMX_U32 and OMX_S32Glenn Kasten2014-04-027-16/+16
| | | | | | | | | | | | Change-Id: I9c41bb34c35595ac19a7ab8faaacde8cb4fa9a15
* | | Fix aac decoder flushMarco Nelissen2014-04-021-0/+6
| | | | | | | | | | | | | | | | | | b/8543366 Change-Id: I746ffed6289486b802a2292bfc492ea6c780ed0b
* | | 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
* | libstagefright is no longer 32 bit only.Narayan Kamath2014-03-197-13/+0
| | | | | | | | Change-Id: I88d5fcfc005a2c2acd0246cdd9c08b6c00b6c39b Signed-off-by: Glenn Kasten <gkasten@android.com>
* | libstagefright_foundation: fix printf format for 64-bitColin Cross2014-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes build error: frameworks/av/media/libstagefright/foundation/ANetworkSession.cpp:582:131: error: format '%d' expects argument of type 'int', but argument 4 has type 'size_t {aka long unsigned int}' [-Werror=format=] ALOGI("%d datagrams remain queued.", mOutFragments.size()); ^ cc1plus: all warnings being treated as errors Change-Id: I69d1f086b8f1e450f107671c8f8f3ed696d170b4
* | More precise 32-bit only for libstagefright/ subdirectoriesGlenn Kasten2014-03-175-0/+10
| | | | | | | | Change-Id: Ie4e8f9ccd834b902287d3452cc9fa739809ddb68
* | Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-146-0/+10
|\ \
| * | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-126-0/+10
| | | | | | | | | | | | | | | | | | also 32-bit only command-line apps Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
* | | Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
|\ \ \ | |/ / |/| |
| * | Implemented support for RTSP 301 RedirectDavid Williams2012-12-031-11/+22
| | | | | | | | | | | | | | | | | | RTSP 301 (Permament Redirect) support has been implemented. Change-Id: If82ffc87f4e7dcbdf98e0a662a35cc086750fc1b
* | | Remove streaming URI from default logsDavid Williams2014-03-105-6/+5
| | | | | | | | | | | | | | | | | | Streaming URI should not be visible in default logcat logs Change-Id: I104cc56b5335f8c5621013e4c5be8028f0379833