summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* Merge "Advance read pointer before failing"Marco Nelissen2014-02-241-22/+47
|\
| * Advance read pointer before failingMarco Nelissen2014-02-241-22/+47
* | LiveSession refactor: reverted loop indice change.Robert Shih2014-02-241-2/+1
* | Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback"Robert Shih2014-02-242-7/+157
|\ \ | |/ |/|
| * stagefright: use CODECS field in EXT-X_STREAM-INF as fallbackRobert Shih2014-01-292-7/+157
* | Merge "Add method to get redirected Uri"Marco Nelissen2014-02-241-0/+4
|\ \
| * | Add method to get redirected UriMarco Nelissen2014-02-211-0/+4
* | | Merge "support for time lapse/slow motion when using SURFACE source"Chong Zhang2014-02-225-9/+100
|\ \ \ | |/ / |/| |
| * | support for time lapse/slow motion when using SURFACE sourceChong Zhang2014-02-145-9/+100
* | | Merge "LiveSession refactor"Robert Shih2014-02-214-139/+93
|\ \ \
| * | | LiveSession refactorRobert Shih2014-02-204-139/+93
* | | | resolved conflicts for merge of aa0390b7 to masterMarco Nelissen2014-02-202-4/+13
|\ \ \ \
| * \ \ \ am 4ee5d2b9: Merge "LiveSession: Use the actual, possibly redirected url as b...Marco Nelissen2014-02-202-4/+13
| |\ \ \ \
| | * \ \ \ 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
* | | | | | | Merge "fix codec buffer leak in error handling when timestamp goes backward"Chong Zhang2014-02-191-7/+7
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | fix codec buffer leak in error handling when timestamp goes backwardChong Zhang2014-02-141-7/+7
* | | | | | | Merge "Handle recording failure more gracefully."Ruben Brunk2014-02-191-8/+19
|\ \ \ \ \ \ \
| * | | | | | | Handle recording failure more gracefully.Ruben Brunk2014-02-181-8/+19
* | | | | | | | Expand support for fragmented mp4Marco Nelissen2014-02-191-12/+27
* | | | | | | | Fix crash when seeking fragmented mp4 filesMarco Nelissen2014-02-181-10/+17
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge "Skip scaling_list definitions in AVC seq header."Andreas Huber2014-02-181-1/+37
|\ \ \ \ \ \ \
| * | | | | | | Skip scaling_list definitions in AVC seq header.Andreas Huber2014-02-141-1/+37
* | | | | | | | Merge "LiveSession: Add support for block-by-block fetchFile."Robert Shih2014-02-152-35/+80
|\ \ \ \ \ \ \ \
| * | | | | | | | LiveSession: Add support for block-by-block fetchFile.Robert Shih2014-02-132-35/+80
* | | | | | | | | Merge "PlaylistFetcher: Add support for block-by-block decryption."Robert Shih2014-02-152-37/+75
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | PlaylistFetcher: Add support for block-by-block decryption.Robert Shih2014-02-132-37/+75
| |/ / / / / / / /
* | | | | | | | | Merge "AnotherPacketSource support to get latest buffered MetaData."Robert Shih2014-02-152-2/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | AnotherPacketSource support to get latest buffered MetaData.Robert Shih2014-02-032-2/+25
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge "Try not to have sample durations vary too much"Marco Nelissen2014-02-141-0/+16
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Try not to have sample durations vary too muchMarco Nelissen2014-02-131-0/+16
* | | | | | | | | Remove unused FragmentedMP4Parser and friends. The functionality has beenAndreas Huber2014-02-135-2778/+0
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | am 49960807: am 0105027f: Fix wrong channel table in ESQueue according to the...Dongwon Kang2014-02-131-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | am 0105027f: Fix wrong channel table in ESQueue according to the A/52 table 5.8Dongwon Kang2014-02-131-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix wrong channel table in ESQueue according to the A/52 table 5.8Dongwon Kang2014-02-111-1/+1
* | | | | | | | | Merge "Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s)."Andreas Huber2014-02-124-3/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s).Andreas Huber2014-02-124-3/+6
* | | | | | | | | | Merge "Fix warnings (now errors) in YUVImage.cpp"Andreas Huber2014-02-121-6/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix warnings (now errors) in YUVImage.cppAndreas Huber2014-02-121-6/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge "Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 byt...Rachad2014-02-121-3/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Increased recorded MP4 max file size to 4GBRachad2014-02-101-3/+5
* | | | | | | | | | | Merge "fix the OS X builds until we can fix compiler warnings that apparently"Andreas Huber2014-02-125-9/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix the OS X builds until we can fix compiler warnings that apparentlyAndreas Huber2014-02-115-9/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | fix the build by fixing more warnings.Andreas Huber2014-02-112-6/+8
|/ / / / / / / / / /
* | | | | | | | | | am 1c178d3e: am 7eacea11: Merge "avcenc: Only do startcode escaping if the ne...Lajos Molnar2014-02-111-6/+9
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am 7eacea11: Merge "avcenc: Only do startcode escaping if the next byte requi...Lajos Molnar2014-02-111-6/+9
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Merge "avcenc: Only do startcode escaping if the next byte requires it"Lajos Molnar2014-02-111-6/+9
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | avcenc: Only do startcode escaping if the next byte requires itMartin Storsjo2014-02-111-6/+9
* | | | | | | | | | | Merge "warnings be gone."Andreas Huber2014-02-11117-194/+431
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | warnings be gone.Andreas Huber2014-02-11117-194/+431
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |