summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-277-9/+9
* Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
|\
| * Only increase the counter when we do take a wakelockJimmy Dalqvist2014-01-221-5/+7
* | Do partial reads in MemoryLeakTrackUtilOscar Rydhé2014-01-231-3/+11
|/
* Merge "Long mp3 metadata displays as corrupted file after transfer"Marco Nelissen2014-01-173-18/+26
|\
| * Long mp3 metadata displays as corrupted file after transferYin Liu2013-12-203-18/+26
* | Merge "Added support for ID3v2 meta data in 3gp files"Marco Nelissen2014-01-175-9/+89
|\ \
| * | Added support for ID3v2 meta data in 3gp filesOscar Rydhé2014-01-165-9/+89
* | | Merge "Fix compile error in NuPlayerRenderer debug print"Marco Nelissen2014-01-171-1/+3
|\ \ \ | |/ / |/| |
| * | Fix compile error in NuPlayerRenderer debug printOscar Rydhé2014-01-031-1/+3
* | | Merge "Avoid jumps to faulty position after seeks"Marco Nelissen2014-01-151-1/+4
|\ \ \
| * | | Avoid jumps to faulty position after seeksRoger1 Jonsson2013-12-181-1/+4
| | |/ | |/|
* | | Merge "Fix c++11 narrowing"Nick Kralevich2014-01-111-1/+1
|\ \ \
| * | | Fix c++11 narrowingsynergydev2013-10-251-1/+1
* | | | Merge "HLS: Fixed rounding error with decimal segment duration"Marco Nelissen2014-01-091-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | HLS: Fixed rounding error with decimal segment durationOscar Rydhé2013-12-191-1/+1
| | |/ | |/|
* | | stagefright: do not offload LD-AAC decodingEric Laurent2013-12-212-0/+14
* | | stagefright: fix offloading HE-AAC sampling rate.Eric Laurent2013-12-191-17/+23
|/ /
* | libeffects: do not use GNU old-style field designatorssynergy dev2013-12-172-14/+14
* | libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2013-12-172-6/+9
* | AudioTrack: fix position callback after restoreEric Laurent2013-12-171-1/+0
* | update offloaded audio track sampling rateEric Laurent2013-12-174-2/+42
* | Merge "Increase kFastTrackMultiplier from 1 to 2"Glenn Kasten2013-12-171-4/+7
|\ \
| * | Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2013-12-041-4/+7
* | | Merge commit '2381f06f374ee0cb8bca0edf5388394432b00e6d' into HEADThe Android Open Source Project2013-12-0524-125/+338
|\ \ \ | |/ / |/| |
| * | am 24605338: Merge "Fix metadata access" into klp-devMarco Nelissen2013-11-152-3/+9
| |\ \
| | * \ Merge "Fix metadata access" into klp-devMarco Nelissen2013-11-152-3/+9
| | |\ \
| | | * | Fix metadata accessMarco Nelissen2013-11-152-3/+9
| * | | | am 7dae71d6: Merge "AwesomePlayer: correct stream type for offload" into klp-devEric Laurent2013-11-153-4/+17
| |\ \ \ \ | | |/ / /
| | * | | AwesomePlayer: correct stream type for offloadEric Laurent2013-11-143-4/+17
| | |/ /
| * | | am 92092b39: Merge "stagefright: limit default max-input-size for AVC" into k...Lajos Molnar2013-11-131-7/+18
| |\ \ \ | | |/ /
| | * | Merge "stagefright: limit default max-input-size for AVC" into klp-devLajos Molnar2013-11-131-7/+18
| | |\ \
| | | * | stagefright: limit default max-input-size for AVCLajos Molnar2013-11-131-7/+18
| * | | | am 069bcc50: Merge "AwesomePlayer: Improve performance on high-fps clips" int...Lajos Molnar2013-11-131-1/+36
| |\ \ \ \ | | |/ / /
| | * | | Merge "AwesomePlayer: Improve performance on high-fps clips" into klp-devLajos Molnar2013-11-131-1/+36
| | |\ \ \ | | | |/ / | | |/| |
| | | * | AwesomePlayer: Improve performance on high-fps clipsLajos Molnar2013-11-121-1/+36
| * | | | am 5595f6de: Merge "Only initialize sniffers once, don\'t hold mutex while sn...Marco Nelissen2013-11-131-16/+27
| |\ \ \ \ | | |/ / /
| | * | | Merge "Only initialize sniffers once, don't hold mutex while sniffing" into k...Marco Nelissen2013-11-131-16/+27
| | |\ \ \
| | | * | | Only initialize sniffers once, don't hold mutex while sniffingMarco Nelissen2013-11-111-16/+27
| * | | | | am 26c8f714: Merge "Ignore transport stream packets with the "transport_error...Andreas Huber2013-11-131-1/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Ignore transport stream packets with the "transport_error_indicator" b...Andreas Huber2013-11-131-1/+4
| | |\ \ \ \
| | | * | | | Ignore transport stream packets with the "transport_error_indicator" bit setAndreas Huber2013-11-121-1/+4
| | | |/ / /
| * | | | | am 56477eb7: am 27ae268a: am 00cb884f: Merge "StageFright: Removes hacks for ...Adam Hampson2013-11-132-9/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 27ae268a: am 00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 ...Adam Hampson2013-11-132-9/+2
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | am 00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into...Adam Hampson2013-11-132-9/+2
| | | |\ \ \
| | | | * | | StageFright: Removes hacks for Nvidia MPEG2 decoderSuresh Choudhary2013-08-092-9/+2
| * | | | | | am 22990fe1: Merge "Back to the old way of making sure that no more buffers a...Andreas Huber2013-11-121-2/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Back to the old way of making sure that no more buffers are submitted"...Andreas Huber2013-11-121-2/+4
| | |\ \ \ \ \
| | | * | | | | Back to the old way of making sure that no more buffers are submittedAndreas Huber2013-11-081-2/+4
| * | | | | | | am caee8747: Merge "configure bitrate and bitrate mode at encoder initializat...Andreas Huber2013-11-111-0/+16
| |\ \ \ \ \ \ \ | | |/ / / / / /