summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-192-30/+55
|\ | | | | | | | | * commit 'b635b0e66b257ab442e230bca96afd5105cf6829': mediaplayer: keep more buffers with the BufferQueue
| * mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-192-30/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change OMX buffer allocation policy to allocate nBufferCountMin + what is required for the BQ. For the BQ, try to allocate 2 additional buffers than the minimum undequeued count. Also account for the fact that BQ may return one less than the actual minimum undequeued count. In most cases the resulting number of buffers ends up being the same as with the previous policy, but we keep more buffers with the BQ. Change-Id: I826db8bf7dd333b620299dba60bf1b81b228275d Bug: 13170236
* | am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.Robert Shih2014-03-195-188/+285
|\ \ | |/ | | | | | | * commit '43ca783effd99bba0e6e2dd6fe177a8888578ef8': httplive: block-by-block fetch, decrypt, and parse ts files.
| * httplive: block-by-block fetch, decrypt, and parse ts files.Robert Shih2014-03-195-188/+285
| | | | | | | | Bug: 12060952 Change-Id: I695345081fe23961b9d0ef6db264885f914703ec
* | am b2ecad7f: Merge "libstagefright_foundation: fix printf format for 64-bit"Colin Cross2014-03-181-1/+1
|\ \ | | | | | | | | | | | | * commit 'b2ecad7f079f4f852d334e67fd7a72ff1696a78e': libstagefright_foundation: fix printf format for 64-bit
| * | 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
* | | am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"Glenn Kasten2014-03-185-0/+10
|\ \ \ | |/ / | | | | | | | | | * commit '64727dd7c8513b6c9ddcce2f4b305618bb76121c': More precise 32-bit only for libstagefright/ subdirectories
| * | More precise 32-bit only for libstagefright/ subdirectoriesGlenn Kasten2014-03-175-0/+10
| | | | | | | | | | | | Change-Id: Ie4e8f9ccd834b902287d3452cc9fa739809ddb68
* | | am 75dcf510: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-1/+101
|\ \ \ | | |/ | |/| | | | | | | * commit '75dcf5101c90e31bbac95694d835b0e8f57ba720': Verify certificates
| * | Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-1/+101
| |\ \
| | * | Verify certificatesMarco Nelissen2014-03-132-1/+101
| | | | | | | | | | | | | | | | | | | | | | | | b/13418320 Change-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b
* | | | am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-146-0/+10
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9': mediaserver and associated services are 32-bit only
| * | | 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
* | | | | am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '4a67fc49d926c75fa6a96160ba5627fb0e209db6': Implemented support for RTSP 301 Redirect
| * | | | 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
* | | | | am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-142-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | * commit '70cc5bdc0fca3f67f3602f04152c29323cad99df': LiveSession: fix incorrect stream key (subtitle"s") M3UParser: trim spaces when parsing comma separated codecs.
| * | | | Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-122-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: LiveSession: fix incorrect stream key (subtitle"s") M3UParser: trim spaces when parsing comma separated codecs.
| | * | | | LiveSession: fix incorrect stream key (subtitle"s")Robert Shih2014-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13402087 Change-Id: Ic46e3069c6e41f90ead47cae84cbe0123d11002a
| | * | | | M3UParser: trim spaces when parsing comma separated codecs.Robert Shih2014-03-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13402087 Change-Id: Idc92716bfefd6d1b0cb371d0d97d990d53288090
* | | | | | am 67a10c52: Merge "httplive: clear access units before returning from ↵Lajos Molnar2014-03-144-15/+42
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seekTo." into klp-dev * commit '67a10c522898d8223f5a2d389a846b7e2327148a': httplive: clear access units before returning from seekTo.
| * | | | | Merge "httplive: clear access units before returning from seekTo." into klp-devLajos Molnar2014-03-124-15/+42
| |\ \ \ \ \ | | |/ / / /
| | * | | | httplive: clear access units before returning from seekTo.Robert Shih2014-03-114-15/+42
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Bug: 12060952 Change-Id: I6a69a718c082501003ee9b78a948a2f8bbfbb14e
* | | | | am cf49a51f: fix codec buffer leak in error handling when timestamp goes ↵Chong Zhang2014-03-141-7/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | backward * commit 'cf49a51ff59c3cd228d178d23252ac0d39d5a893': fix codec buffer leak in error handling when timestamp goes backward
| * | | | fix codec buffer leak in error handling when timestamp goes backwardChong Zhang2014-03-111-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't touch codec buffer if we decided to drop a frame with bad pts Bug: 11971963 Change-Id: I9b4c56210f64258f1be257b14184381a1133e0d6 (cherry picked from commit b63d2433350d56bda9f3477549086c90bb6d535e)
* | | | | am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" ↵Chong Zhang2014-03-134-6/+167
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'c69bc40a347c411751cb082b3eb4a82d976a68ec': Cap pts gap between adjacent frames to specified value
| * | | | Merge "Cap pts gap between adjacent frames to specified value" into klp-devChong Zhang2014-03-114-6/+167
| |\ \ \ \
| | * | | | Cap pts gap between adjacent frames to specified valueChong Zhang2014-03-114-6/+167
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - In the scenario of cast mirroring, encoding could be suspended for prolonged periods. Limiting the pts gap to workaround the problem where encoder's rate control logic produces huge frames after a long period of suspension. - Repeat last frame a couple more times to get better quality on static scenes. - Fix the timestamp on repeat frames (it was not set) Bug: 11971963 Change-Id: I1d68ab3d269874bf3921aa429a985c5f63e428c7 (cherry picked from commit 94ee4b708acfa941581160b267afb79192b1d816)
* | | | | am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspendedChong Zhang2014-03-131-0/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '1c608ab33acab82d4a87f1abedcc99a623d1b53a': save mGraphicBuffer pointer even when we're suspended
| * | | | save mGraphicBuffer pointer even when we're suspendedChong Zhang2014-03-111-0/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 12609966 Change-Id: Ifd41fd973876da69039113fcaeacdccf39472b37 (cherry picked from commit 49270665e7a20cd120724fc388da8b166ff0b4f1)
* | | | am 19afb386: Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-135-6/+5
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '19afb3869eb6a3e3733dc1f7420e1d4c3c03d376': Remove streaming URI from default logs
| * | | Remove streaming URI from default logsDavid Williams2014-03-105-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | Streaming URI should not be visible in default logcat logs Change-Id: I104cc56b5335f8c5621013e4c5be8028f0379833
* | | | am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"Narayan Kamath2014-03-112-4/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '2ad7af29bb667d939f27417011567847c4b62f94': Check for ARCH_ARM_HAVE_NEON flag only for ARM arch
| * | | Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"Narayan Kamath2014-03-072-4/+7
| |\ \ \
| | * | | Check for ARCH_ARM_HAVE_NEON flag only for ARM archAshok Bhat2014-03-032-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch prevents ARM neon code from being included for Arm64, where ARM is the 2nd architecture. Change-Id: I5a283991034f2650a0e7d4227aef967be276fc9c Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | am a9b82160: Merge "LP64 fixes for media/libeffects"Narayan Kamath2014-03-1114-61/+62
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'a9b82160a6682438d43709ba5e7a29022ad1af58': LP64 fixes for media/libeffects
| * | | | Merge "LP64 fixes for media/libeffects"Narayan Kamath2014-03-0714-61/+62
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | LP64 fixes for media/libeffectsAshok Bhat2014-02-2014-61/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes include: [x] In get parameter series of functions, replaced size_t* formal parameter type with uint32_t* where actual parameter passed was uint32_t*. [x] In set parameter series of functions, changed size_t formal parameter to uint32_t where actual parameter was uint32_t. [x] Changed the definition of LVM_UINT32 from unsigned long to uint32_t as unsigned long is 64-bit in LP64. [x] Used other stdint.h types for other LVM_types for consistency. [x] Use of uintptr_t for the pNextMember of the INST_ALLOC structure, rather than LVM_UINT32, for portablility. [x] Use of uintptr_t where pointers are used in arithmetic. [x] Replaced the use of 0xFFFFFFFC with ~3 in places where it was used to clear last two bits. [x] Removed int casts where cmdSize and *replySize, both uint32_t, were being compared with sizeof(). Change-Id: Ibec0b4d8e9b855f44b1cd853be6df84d13cf4186 Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | am 0cf16339: Merge "Fix preventing from heap overwrite in capture command"Glenn Kasten2014-03-111-34/+35
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '0cf1633922f970caee19e2cc2f5c042ca30b4aa6': Fix preventing from heap overwrite in capture command
| * | | | Merge "Fix preventing from heap overwrite in capture command"Glenn Kasten2014-02-281-34/+35
| |\ \ \ \
| | * | | | Fix preventing from heap overwrite in capture commandRyszard Grzesica2014-02-201-34/+35
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was heap usage error in case of stop of audio framework while capturePoint was negative. Pointer to reply data was moved but final silence write was done using original buffer size. Now silence set is done at the beginning under the condition that framework has stopped. Change-Id: I7dab1e922f1813e5fbfd4a64c8b0d15d9465520c
* | | | | am 096d72a3: Merge "AArch64: Correction for LP64"Narayan Kamath2014-03-111-5/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '096d72a32824a0a8c86a716ba44d589183b2b0b3': AArch64: Correction for LP64
| * | | | AArch64: Correction for LP64Marcus Oakland2014-02-261-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Intra16x16PlanePrediction function, a u32 (unsigned 32-bit integer) was being used for the "i" variable, and being used with a value of 7 in the loop "for (i = 0, b = 0; i < 8; i++)" to access the "above[6-i]" location where "above" is defined as "u8 *". Because "i" was unsigned there was no sign extension on use with the __LP64__ 64-bit pointer, so rather than 0xFFFFFFFF being treated as -1, it was treated as 4,292,967,295 and that resulted in a SIGSEGV at an invalid address. By changing the type of "i" to an i32 (signed 32-bit integer) the expected sign extension occurs and the value is treated as -1. This change fixes android.media.cts.DecoderTest#testCodeBasicH264 on 64-bit platforms Change-Id: I85df58b0dc1d39f89ab421d04ab5481356520f0c Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
* | | | | am 8fc4d57d: Merge "Avoid a building error"Glenn Kasten2014-03-111-1/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '8fc4d57d41f532b90187b9404a8ac705770d75b4': Avoid a building error
| * | | | Merge "Avoid a building error"Glenn Kasten2014-02-251-1/+3
| |\ \ \ \
| | * | | | Avoid a building errorChih-Wei Huang2013-01-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | &pDwmModule->config may equal to pConfig that triggers a building error using gcc 4.7: In file included from bionic/libc/include/signal.h:33:0, from bionic/libc/include/sys/select.h:34, from bionic/libc/include/unistd.h:34, from system/core/include/cutils/log.h:34, from frameworks/av/media/libeffects/downmix/EffectDownmix.c:19: In function 'memcpy', inlined from 'Downmix_Configure' at frameworks/av/media/libeffects/downmix/EffectDownmix.c:651:11, inlined from 'Downmix_Init' at frameworks/av/media/libeffects/downmix/EffectDownmix.c:605:9, inlined from 'DownmixLib_Create' at frameworks/av/media/libeffects/downmix/EffectDownmix.c:233:9: bionic/libc/include/string.h:114:31: error: call to '__memcpy_overlap_error' declared with attribute error: memcpy called with overlapping regions Change-Id: Ia6c4aab72e38d00d8d526f3b56fc03b6530b4e44
| * | | | | Merge "LiveSession: Use the actual, possibly redirected url as base in the M3U"Marco Nelissen2014-02-202-4/+13
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | LiveSession: Use the actual, possibly redirected url as base in the M3UMartin Storsjo2014-01-102-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes playback of HLS streams where the M3U playlists use relative paths and the main playlist is opened via a redirect. Change-Id: I787e1c050daddc566be4c8e3f84803d3f91eec46
* | | | | | am 6db20dcb: Merge "AudioTrack: When paused, return cached playback ↵Eric Laurent2014-03-081-3/+22
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | position" into klp-dev * commit '6db20dcb54dad932a3ea2e3a5dca41fce5802eb4': AudioTrack: When paused, return cached playback position
generated by cgit v1.1 at 2024-06-10 03:22:57 +0000