summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "configure bitrate and bitrate mode at encoder initialization for VP8/9...Andreas Huber2013-11-121-0/+16
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | configure bitrate and bitrate mode at encoder initialization for VP8/9Andreas Huber2013-11-051-0/+16
| * | | | | | am e100b813: Merge "StageFrightRecorder: do not use meta-data mode for softwa...Lajos Molnar2013-11-113-11/+35
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "StageFrightRecorder: do not use meta-data mode for software encoders" ...Lajos Molnar2013-11-113-11/+35
| | |\ \ \ \ \
| | | * | | | | StageFrightRecorder: do not use meta-data mode for software encodersLajos Molnar2013-10-303-11/+35
| * | | | | | | am a7291156: Merge "TimedEventQueue: improve wakelock management" into klp-devEric Laurent2013-11-102-43/+55
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "TimedEventQueue: improve wakelock management" into klp-devEric Laurent2013-11-112-43/+55
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | TimedEventQueue: improve wakelock managementEric Laurent2013-11-072-43/+55
| * | | | | | | am 51ac2d64: Merge "Properly handle executing->idle in GraphicBufferSource" i...Andreas Huber2013-11-083-7/+29
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Properly handle executing->idle in GraphicBufferSource" into klp-devAndreas Huber2013-11-083-7/+29
| | |\ \ \ \ \ \
| | | * | | | | | Properly handle executing->idle in GraphicBufferSourceAndreas Huber2013-11-073-7/+29
| | | |/ / / / /
| * | | | | | | am 5572b3af: Replace assert with error messageAndy McFadden2013-11-081-1/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Replace assert with error messageAndy McFadden2013-11-071-1/+6
| | |/ / / / /
| * | | | | | am f8a1169d: Merge "Notify current video size if available" into klp-devMarco Nelissen2013-11-041-1/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Notify current video size if available" into klp-devMarco Nelissen2013-11-041-1/+10
| | |\ \ \ \ \
| | | * | | | | Notify current video size if availableMarco Nelissen2013-11-011-1/+10
| | | |/ / / /
| * | | | | | am 065789f2: Merge "Restore NuPlayer error and EOS handling" into klp-devLajos Molnar2013-11-042-4/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Restore NuPlayer error and EOS handlingLajos Molnar2013-10-302-4/+10
| | | |/ / / | | |/| | |
| * | | | | am c76b9f52: Merge "AwesomePlayer: ensure STARTED message works after reset" ...Lajos Molnar2013-10-301-0/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-devLajos Molnar2013-10-301-0/+5
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | AwesomePlayer: ensure STARTED message works after resetLajos Molnar2013-10-281-0/+5
| * | | | | am eb76f318: am 96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"Lajos Molnar2013-10-291-0/+6
| |\ \ \ \ \
| * \ \ \ \ \ am 9cae2170: Assign blame for playback wakelocks.Marco Nelissen2013-10-264-14/+33
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Assign blame for playback wakelocks.Marco Nelissen2013-10-254-14/+33