summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 72afcd5d: am 5ea5b020: Merge "WA: Queue extra buffers on output port durin...Lajos Molnar2013-11-181-0/+28
|\
| * am 5ea5b020: Merge "WA: Queue extra buffers on output port during reconfig if...Lajos Molnar2013-11-181-0/+28
| |\
| | * Merge "WA: Queue extra buffers on output port during reconfig if input EOS-ed...Lajos Molnar2013-11-191-0/+28
| | |\
| | | * WA: Queue extra buffers on output port during reconfig if input EOS-edLajos Molnar2013-11-141-0/+28
* | | | am 2381f06f: am 24605338: Merge "Fix metadata access" into klp-devMarco Nelissen2013-11-152-3/+9
|\ \ \ \ | |/ / /
| * | | 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 576e89b5: am 7dae71d6: Merge "AwesomePlayer: correct stream type for offlo...Eric Laurent2013-11-153-4/+17
|\ \ \ \ | |/ / /
| * | | 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
| | |/
* | | Merge "Fixed StagefrightRecorder::setupVideoEncoder to use the clipped bitrat...Robert Shih2013-11-152-28/+12
|\ \ \
| * | | Fixed StagefrightRecorder::setupVideoEncoder to use the clipped bitrate valueRobert Shih2013-11-112-28/+12
* | | | am ec89a75e: am 92092b39: Merge "stagefright: limit default max-input-size fo...Lajos Molnar2013-11-131-7/+18
|\ \ \ \ | | |/ / | |/| |
| * | | 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 47afcc5f: am 069bcc50: Merge "AwesomePlayer: Improve performance on high-f...Lajos Molnar2013-11-131-1/+36
|\ \ \ \ \ | |/ / / /
| * | | | 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 5274e21e: am 26c8f714: Merge "Ignore transport stream packets with the "tr...Andreas Huber2013-11-131-1/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 728549e3: am 56477eb7: am 27ae268a: am 00cb884f: Merge "StageFright: Remov...Adam Hampson2013-11-132-9/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 073dec19: am 22990fe1: Merge "Back to the old way of making sure that no m...Andreas Huber2013-11-121-2/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 db50cb5f: am caee8747: Merge "configure bitrate and bitrate mode at encode...Andreas Huber2013-11-111-0/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 cc5aeced: am e100b813: Merge "StageFrightRecorder: do not use meta-data mo...Lajos Molnar2013-11-113-11/+35
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | 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 5b5f76dc: am a7291156: Merge "TimedEventQueue: improve wakelock management...Eric Laurent2013-11-112-43/+55
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
* | | | | | | | Only initialize sniffers once, don't hold mutex while sniffingMarco Nelissen2013-11-111-16/+27